summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMerov Linden <merov@lindenlab.com>2010-09-17 17:00:07 -0700
committerMerov Linden <merov@lindenlab.com>2010-09-17 17:00:07 -0700
commit01b1d3cc951ea3b04ff3bac79ab2fadfd9429ca7 (patch)
treed976620458f63e5a6f5d1f65d0065d3e49dd53e5
parent7c3a81f577307143a6d4bb5cef1606db82397cdd (diff)
parent8eb6c6dec89aff623854394aa8e373926ff4e869 (diff)
STORM-183 : Pull in fix from Vadim
-rw-r--r--indra/newview/llinventorybridge.cpp4
1 files changed, 4 insertions, 0 deletions
diff --git a/indra/newview/llinventorybridge.cpp b/indra/newview/llinventorybridge.cpp
index 02e7f0b9e2..311d791319 100644
--- a/indra/newview/llinventorybridge.cpp
+++ b/indra/newview/llinventorybridge.cpp
@@ -2471,6 +2471,10 @@ void LLFolderBridge::folderOptionsMenu()
{
disabled_items.push_back(std::string("Remove From Outfit"));
}
+ if (!LLAppearanceMgr::instance().getCanReplaceCOF(mUUID))
+ {
+ disabled_items.push_back(std::string("Replace Outfit"));
+ }
mItems.push_back(std::string("Outfit Separator"));
}
LLMenuGL* menup = dynamic_cast<LLMenuGL*>(mMenu.get());