diff options
| author | Tofu Linden <tofu.linden@lindenlab.com> | 2010-01-05 13:38:20 -0800 |
|---|---|---|
| committer | Tofu Linden <tofu.linden@lindenlab.com> | 2010-01-05 13:38:20 -0800 |
| commit | 5a99682d16059a486ffa75aee938e3570e54c0c6 (patch) | |
| tree | 83ed51de10d218c3a86fc60b9d68ff142ea6c427 /indra/newview/llsidepanelappearance.cpp | |
| parent | 5836902ba06f37a8e949f4ed2edbffe5f596915d (diff) | |
| parent | 2ee8c957635d3bb1c0638566c47352d8ddf5b2fe (diff) | |
merge.
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(); |