diff options
| author | Nyx (Neal Orman) <nyx@lindenlab.com> | 2010-01-05 16:20:09 -0500 |
|---|---|---|
| committer | Nyx (Neal Orman) <nyx@lindenlab.com> | 2010-01-05 16:20:09 -0500 |
| commit | 828cf66ce33302c680834e69c775105da4ff1db2 (patch) | |
| tree | cd3aa9a979e5f388d2916c57da0bf82a1d606667 /indra/newview/llsidepanelappearance.cpp | |
| parent | 3e4c0de0720df6da9db3616a65a0f8525276be90 (diff) | |
| parent | 60959b39c6990553221b907ca04cba44841150e8 (diff) | |
Automated merge with ssh://hg.lindenlab.com/viewer/viewer-2-0/
Diffstat (limited to 'indra/newview/llsidepanelappearance.cpp')
| -rw-r--r-- | indra/newview/llsidepanelappearance.cpp | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/indra/newview/llsidepanelappearance.cpp b/indra/newview/llsidepanelappearance.cpp index 30b0075c4b..e2ce534c4f 100644 --- a/indra/newview/llsidepanelappearance.cpp +++ b/indra/newview/llsidepanelappearance.cpp @@ -198,7 +198,7 @@ void LLSidepanelAppearance::onFilterEdit(const std::string& search_string) void LLSidepanelAppearance::onOpenOutfitButtonClicked() { - const LLViewerInventoryItem *outfit_link = LLAppearanceManager::getInstance()->getCurrentOutfitLink(); + const LLViewerInventoryItem *outfit_link = LLAppearanceManager::getInstance()->getBaseOutfitLink(); if (!outfit_link) return; if (!outfit_link->getIsLinkType()) @@ -313,7 +313,7 @@ void LLSidepanelAppearance::refreshCurrentOutfitName(const std::string& name) { if (name == "") { - const LLViewerInventoryItem *outfit_link = LLAppearanceManager::getInstance()->getCurrentOutfitLink(); + const LLViewerInventoryItem *outfit_link = LLAppearanceManager::getInstance()->getBaseOutfitLink(); if (outfit_link) { const LLViewerInventoryCategory *cat = outfit_link->getLinkedCategory(); |