Merge branch 'V2MultiWear' of git://github.com/Shyotl/SingularityViewer into V2MultiWear

Conflicts: indra/llrender/llvertexbuffer.h indra/newview/app_settings/settings.xml indra/newview/llface.cpp
2012-07-03 07:49:22 +02:00
parent f38e8b1981 9ddbc132bf
commit cd2dc2f3ca
170 changed files with 8686 additions and 5913 deletions
--- a/indra/newview/llstartup.cpp
+++ b/indra/newview/llstartup.cpp
@@ -4284,11 +4284,13 @@ bool process_login_success_response(std::string& password)
 			gMoonTextureID = id;
 		}

+#if ENABLE_CLASSIC_CLOUDS
 		id = global_textures["cloud_texture_id"];
 		if(id.notNull())
 		{
 			gCloudTextureID = id;
 		}
+#endif
 	}