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

Initial AISv3 merge. New HTTP messages not plugged in yet.

Browse Source
This commit is contained in:
Shyotl
2015-06-25 20:16:30 -05:00
parent 09f4528bfb
commit 9f10d9510d
71 changed files with 4962 additions and 3452 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
indra/newview/llviewerwearable.cpp
View File

@@ -385,7 +385,7 @@ void LLViewerWearable::writeToAvatar(LLAvatarAppearance *avatarp)
// Updates the user's avatar's appearance, replacing this wearables' parameters and textures with default values.
// static
void LLViewerWearable::removeFromAvatar( LLWearableType::EType type, BOOL upload_bake )
void LLViewerWearable::removeFromAvatar( LLWearableType::EType type, bool upload_bake )
{
if (!isAgentAvatarValid()) return;
@@ -507,7 +507,7 @@ void LLViewerWearable::revertValues()
{
panel->updateScrollingPanelList();
}*/
if( LLFloaterCustomize::instanceExists() && gAgentWearables.getWearableIndex(this)==0 )
if (LLFloaterCustomize::instanceExists() && LLFloaterCustomize::getInstance()->getCurrentWearablePanel()->getWearable() == this)
LLFloaterCustomize::getInstance()->updateScrollingPanelList();
}
@@ -522,7 +522,7 @@ void LLViewerWearable::saveValues()
panel->updateScrollingPanelList();
}*/
if( LLFloaterCustomize::instanceExists() && gAgentWearables.getWearableIndex(this)==0)
if (LLFloaterCustomize::instanceExists() && LLFloaterCustomize::getInstance()->getCurrentWearablePanel()->getWearable() == this)
LLFloaterCustomize::getInstance()->updateScrollingPanelList();
}