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

Conflicts:
	indra/llrender/llvertexbuffer.h
	indra/newview/llface.cpp
	indra/newview/llpaneleditwearable.h
This commit is contained in:
Lirusaito
2012-07-02 04:14:52 -04:00
92 changed files with 3901 additions and 2196 deletions

View File

@@ -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
}