diff options
| author | Graham Linden <graham@lindenlab.com> | 2018-06-11 17:46:16 +0100 |
|---|---|---|
| committer | Graham Linden <graham@lindenlab.com> | 2018-06-11 17:46:16 +0100 |
| commit | a0598b12656cdcf22ba95cacd01b5ff36f8f1b26 (patch) | |
| tree | 3ea09c4043c27998ac26181d80c4d41f8ef87f35 /indra/newview/llstartup.cpp | |
| parent | 507c4921826e73635f6ae31087ab0e6cd1280f43 (diff) | |
Fix water fog consolidation in underwater shaders.
Add plumbing facilities to allow current and next moon textures to be passed to moon shader.
Modify moon shader to blend between current and next moon textures by blend factor.
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 |