summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorIgor Borovkov <iborovkov@productengine.com>2010-05-21 13:44:42 +0300
committerIgor Borovkov <iborovkov@productengine.com>2010-05-21 13:44:42 +0300
commit1d4b26832c735ee616abf6a17f3271492fe30b4f (patch)
tree714030ba1022367ca624633bdbb511ad7d3bd9ad
parentda35ebe3127b0abe80e9ccb361ed0211b625c95a (diff)
EXT-7331 FIXED added updating the title (panel outfit edit) on replacing/wearing outfit externally (my inventory)
Reviewed by Neal Orman and Mike Antipov --HG-- branch : product-engine
-rw-r--r--indra/newview/llpaneloutfitedit.cpp11
-rw-r--r--indra/newview/llpaneloutfitedit.h3
2 files changed, 11 insertions, 3 deletions
diff --git a/indra/newview/llpaneloutfitedit.cpp b/indra/newview/llpaneloutfitedit.cpp
index 4f3f73beca..ceb720908a 100644
--- a/indra/newview/llpaneloutfitedit.cpp
+++ b/indra/newview/llpaneloutfitedit.cpp
@@ -148,6 +148,8 @@ protected:
else
{
mBaseOutfitId = baseoutfit_id;
+ mPanel->updateCurrentOutfitName();
+
if (baseoutfit_id.isNull()) return;
mBaseOutfitLastVersion = getCategoryVersion(mBaseOutfitId);
@@ -643,6 +645,13 @@ void LLPanelOutfitEdit::displayCurrentOutfit()
setVisible(TRUE);
}
+ updateCurrentOutfitName();
+
+ update();
+}
+
+void LLPanelOutfitEdit::updateCurrentOutfitName()
+{
std::string current_outfit_name;
if (LLAppearanceMgr::getInstance()->getBaseOutfitName(current_outfit_name))
{
@@ -652,8 +661,6 @@ void LLPanelOutfitEdit::displayCurrentOutfit()
{
mCurrentOutfitName->setText(getString("No Outfit"));
}
-
- update();
}
//private
diff --git a/indra/newview/llpaneloutfitedit.h b/indra/newview/llpaneloutfitedit.h
index a08dc653ef..5ebe1e0406 100644
--- a/indra/newview/llpaneloutfitedit.h
+++ b/indra/newview/llpaneloutfitedit.h
@@ -104,7 +104,8 @@ public:
void onEditWearableClicked(void);
void displayCurrentOutfit();
-
+ void updateCurrentOutfitName();
+
void update();
void updateVerbs();