summaryrefslogtreecommitdiff
path: root/indra/newview/lloutfitslist.cpp
diff options
context:
space:
mode:
authorRichard Linden <none@none>2010-08-12 10:10:09 -0700
committerRichard Linden <none@none>2010-08-12 10:10:09 -0700
commit73952a37ed7a11331154f2f68050286722ec96da (patch)
tree7ce6c9f6d0c3f6b0e85efc57736340106329beb4 /indra/newview/lloutfitslist.cpp
parente16c1f6fdd300f284f0b39b76b4e82f7366b5cdb (diff)
parent402e2a181831d30a6a2586fd4b0641ba66da99be (diff)
Automated merge with http://10.1.4.28:8000/
Diffstat (limited to 'indra/newview/lloutfitslist.cpp')
-rw-r--r--indra/newview/lloutfitslist.cpp10
1 files changed, 2 insertions, 8 deletions
diff --git a/indra/newview/lloutfitslist.cpp b/indra/newview/lloutfitslist.cpp
index 8147a97317..f921bca623 100644
--- a/indra/newview/lloutfitslist.cpp
+++ b/indra/newview/lloutfitslist.cpp
@@ -275,11 +275,10 @@ protected:
}
else if ("wear_replace" == param)
{
- return !gAgentWearables.isCOFChangeInProgress();
+ return LLAppearanceMgr::instance().getCanReplaceCOF(outfit_cat_id);
}
else if ("wear_add" == param)
{
- if (gAgentWearables.isCOFChangeInProgress()) return false;
return LLAppearanceMgr::getCanAddToCOF(outfit_cat_id);
}
else if ("take_off" == param)
@@ -676,7 +675,7 @@ bool LLOutfitsList::isActionEnabled(const LLSD& userdata)
}
// outfit selected
- return LLAppearanceMgr::getCanAddToCOF(mSelectedOutfitUUID);
+ return LLAppearanceMgr::instance().getCanReplaceCOF(mSelectedOutfitUUID);
}
if (command_name == "take_off")
{
@@ -689,11 +688,6 @@ bool LLOutfitsList::isActionEnabled(const LLSD& userdata)
if (command_name == "wear_add")
{
// *TODO: do we ever get here?
- if (gAgentWearables.isCOFChangeInProgress())
- {
- return false;
- }
-
return LLAppearanceMgr::getCanAddToCOF(mSelectedOutfitUUID);
}