diff options
| author | Rider Linden <rider@lindenlab.com> | 2018-06-11 11:45:11 -0700 |
|---|---|---|
| committer | Rider Linden <rider@lindenlab.com> | 2018-06-11 11:45:11 -0700 |
| commit | 0f608cb764856ae8586a9d9631842a782cb70a23 (patch) | |
| tree | 97a12c3bfcc14ae73df00c68141e9519493a0619 /indra/newview/llstartup.cpp | |
| parent | 97da85de0b1e0f8c2fc60c156c31b237b869230a (diff) | |
| parent | 4fbdfe637049e0a2e93c6fed030e61b32a43ae07 (diff) | |
Merge
Diffstat (limited to 'indra/newview/llstartup.cpp')
| -rw-r--r-- | indra/newview/llstartup.cpp | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/indra/newview/llstartup.cpp b/indra/newview/llstartup.cpp index e7a149ac0c..7430a2578f 100644 --- a/indra/newview/llstartup.cpp +++ b/indra/newview/llstartup.cpp @@ -3499,6 +3499,8 @@ bool process_login_success_response() } } +// LAPRAS +#if 0 LLSD global_textures = response["global-textures"][0]; if(global_textures.size()) { @@ -3516,8 +3518,8 @@ bool process_login_success_response() { gMoonTextureID = id; } - } +#endif // set the location of the Agent Appearance service, from which we can request // avatar baked textures if they are supported by the current region |