From f0ab36aec55550ed86d969ccdbad45c5a8db277c Mon Sep 17 00:00:00 2001
From: Mnikolenko Productengine <mnikolenko@productengine.com>
Date: Tue, 26 Jul 2016 16:12:53 +0300
Subject: [PATCH] build fix
---
indra/newview/llagentwearables.cpp | 2 +-
indra/newview/llviewerwearable.cpp | 11 ++++++++---
indra/newview/llviewerwearable.h | 4 +++-
3 files changed, 12 insertions(+), 5 deletions(-)
diff --git a/indra/newview/llagentwearables.cpp b/indra/newview/llagentwearables.cpp
index 060bb4c6b94..170e4063a15 100644
--- a/indra/newview/llagentwearables.cpp
+++ b/indra/newview/llagentwearables.cpp
@@ -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)
diff --git a/indra/newview/llviewerwearable.cpp b/indra/newview/llviewerwearable.cpp
index 1fa8884b9d3..88eb13e7cdf 100644
--- a/indra/newview/llviewerwearable.cpp
+++ b/indra/newview/llviewerwearable.cpp
@@ -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();
diff --git a/indra/newview/llviewerwearable.h b/indra/newview/llviewerwearable.h
index 6f116d32262..cc99f6af2f7 100644
--- a/indra/newview/llviewerwearable.h
+++ b/indra/newview/llviewerwearable.h
@@ -82,9 +82,11 @@ class LLViewerWearable : public LLWearable
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;
--
GitLab