Singularity-Viewer/SingularityViewer
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

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

Browse Source 
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
parent 5f98e24efe 53a570b977
commit 24db228406
92 changed files with 3901 additions and 2196 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
indra/newview/llpaneleditwearable.cpp
View File

@@ -934,7 +934,7 @@ void LLPanelEditWearable::setWearableIndex(S32 index)
}
const LLEditWearableDictionary::SubpartEntry *subpart_entry = LLEditWearableDictionary::getInstance()->getSubpart(mCurrentSubpart);
const LLEditWearableDictionary::SubpartEntry *subpart_entry = LLEditWearableDictionary::getInstance()->getSubpart((ESubpart)mCurrentSubpart);
if(subpart_entry)
{
value_map_t sorted_params;