diff options
| author | Don Kjer <don@lindenlab.com> | 2011-07-08 18:25:07 -0700 |
|---|---|---|
| committer | Don Kjer <don@lindenlab.com> | 2011-07-08 18:25:07 -0700 |
| commit | b9d6b5ef9a9797709397be983ec74c30cd1e0ce2 (patch) | |
| tree | 9886deac5d65ee1873e8c75ed2af62943c872f63 /indra/newview/llstartup.cpp | |
| parent | 615cc856a8abf44f62c58962f8b53178f9708ee3 (diff) | |
| parent | ccb3ad90001c2b19cbd690d67317651ee0182f42 (diff) | |
Merge viewer-development -> mesh-development
Diffstat (limited to 'indra/newview/llstartup.cpp')
| -rw-r--r-- | indra/newview/llstartup.cpp | 8 |
1 files changed, 0 insertions, 8 deletions
diff --git a/indra/newview/llstartup.cpp b/indra/newview/llstartup.cpp index 86b09473ab..3c2ef37bb8 100644 --- a/indra/newview/llstartup.cpp +++ b/indra/newview/llstartup.cpp @@ -163,7 +163,6 @@ #include "llviewerwindow.h" #include "llvoavatar.h" #include "llvoavatarself.h" -#include "llvoclouds.h" #include "llweb.h" #include "llworld.h" #include "llworldmapmessage.h" @@ -1171,8 +1170,6 @@ bool idle_startup() // init the shader managers LLPostProcess::initClass(); - LLWLParamManager::initClass(); - LLWaterParamManager::initClass(); LLViewerObject::initVOClasses(); @@ -3150,11 +3147,6 @@ bool process_login_success_response() gMoonTextureID = id; } - id = global_textures["cloud_texture_id"]; - if(id.notNull()) - { - gCloudTextureID = id; - } } // Set the location of the snapshot sharing config endpoint |