build fix

meow-7.2.2
Mnikolenko Productengine 2016-07-26 16:12:53 +03:00
parent 5193567345
commit f0ab36aec5
3 changed files with 12 additions and 5 deletions

View File

@ -433,7 +433,7 @@ void LLAgentWearables::saveWearableAs(const LLWearableType::EType type,
// old_wearable may still be referred to by other inventory items. Revert
// unsaved changes so other inventory items aren't affected by the changes
// that were just saved.
old_wearable->revertValues(false);
old_wearable->revertValuesWithoutUpdate();
}
void LLAgentWearables::revertWearable(const LLWearableType::EType type, const U32 index)

View File

@ -451,7 +451,7 @@ void LLViewerWearable::copyDataFrom(const LLViewerWearable* src)
// Probably reduntant, but ensure that the newly created wearable is not dirty by setting current value of params in new wearable
// to be the same as the saved values (which were loaded from src at param->cloneParam(this))
revertValues(false);
revertValuesWithoutUpdate();
}
void LLViewerWearable::setItemID(const LLUUID& item_id)
@ -459,18 +459,23 @@ void LLViewerWearable::setItemID(const LLUUID& item_id)
mItemID = item_id;
}
void LLViewerWearable::revertValues(bool update_panel)
void LLViewerWearable::revertValues()
{
LLWearable::revertValues();
LLSidepanelAppearance *panel = dynamic_cast<LLSidepanelAppearance*>(LLFloaterSidePanelContainer::getPanel("appearance"));
if( panel && update_panel)
if( panel )
{
panel->updateScrollingPanelList();
}
}
void LLViewerWearable::revertValuesWithoutUpdate()
{
LLWearable::revertValues();
}
void LLViewerWearable::saveValues()
{
LLWearable::saveValues();

View File

@ -82,9 +82,11 @@ public:
friend std::ostream& operator<<(std::ostream &s, const LLViewerWearable &w);
/*virtual*/ void revertValues(bool update_panel = true);
/*virtual*/ void revertValues();
/*virtual*/ void saveValues();
void revertValuesWithoutUpdate();
// Something happened that requires the wearable's label to be updated (e.g. worn/unworn).
/*virtual*/void setUpdated() const;