diff options
author | Richard Linden <none@none> | 2010-07-27 14:44:17 -0700 |
---|---|---|
committer | Richard Linden <none@none> | 2010-07-27 14:44:17 -0700 |
commit | c96caed698afb38c50db229fff35fa8b91e40f83 (patch) | |
tree | 62a847bc2cc299b6979e6ed143843c902efb7a33 /indra/newview/llcofwearables.cpp | |
parent | 0f2f597e7aa5011061c3ea1fef5867814ee3a5b2 (diff) |
Merge from dessie/viewer-release
Diffstat (limited to 'indra/newview/llcofwearables.cpp')
-rw-r--r-- | indra/newview/llcofwearables.cpp | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/indra/newview/llcofwearables.cpp b/indra/newview/llcofwearables.cpp index f356a04fa4..78405ebe33 100644 --- a/indra/newview/llcofwearables.cpp +++ b/indra/newview/llcofwearables.cpp @@ -660,20 +660,20 @@ LLAssetType::EType LLCOFWearables::getExpandedAccordionAssetType() { const LLAccordionCtrlTab* expanded_tab = mAccordionCtrl->getExpandedTab(); - return get_if_there(mTab2AssetType, expanded_tab, LLAssetType::AT_NONE); + return get_if_there(mTab2AssetType, expanded_tab, LLAssetType::AT_NONE); } return LLAssetType::AT_NONE; } LLAssetType::EType LLCOFWearables::getSelectedAccordionAssetType() -{ + { if (mAccordionCtrl != NULL) { const LLAccordionCtrlTab* selected_tab = mAccordionCtrl->getSelectedTab(); - return get_if_there(mTab2AssetType, selected_tab, LLAssetType::AT_NONE); - } + return get_if_there(mTab2AssetType, selected_tab, LLAssetType::AT_NONE); +} return LLAssetType::AT_NONE; } |