diff options
| author | Loren Shih <seraph@lindenlab.com> | 2010-08-23 17:12:10 -0400 |
|---|---|---|
| committer | Loren Shih <seraph@lindenlab.com> | 2010-08-23 17:12:10 -0400 |
| commit | 782a0cf81190449dbeaff6372cacc5d9b34fdcfa (patch) | |
| tree | e7abf711ac492ff670c23f799430c17f54303a0d /indra/newview/llinventorybridge.cpp | |
| parent | 981a43b355e44daa7e1b4065b896ea4cd2fec3a2 (diff) | |
Fixed backwards compatibility so that orig Breast params are preserved.
Cleaned up some code.
Removed "Add" from right-click when multiwear is not permitted.
Diffstat (limited to 'indra/newview/llinventorybridge.cpp')
| -rw-r--r-- | indra/newview/llinventorybridge.cpp | 11 |
1 files changed, 7 insertions, 4 deletions
diff --git a/indra/newview/llinventorybridge.cpp b/indra/newview/llinventorybridge.cpp index a564059b87..27a01dd94f 100644 --- a/indra/newview/llinventorybridge.cpp +++ b/indra/newview/llinventorybridge.cpp @@ -4492,14 +4492,17 @@ void LLWearableBridge::buildContextMenu(LLMenuGL& menu, U32 flags) else { items.push_back(std::string("Wearable And Object Wear")); - items.push_back(std::string("Wearable Add")); disabled_items.push_back(std::string("Take Off")); disabled_items.push_back(std::string("Wearable Edit")); } - if (gAgentWearables.isWearingWearableType(mWearableType) && - !LLWearableType::getAllowMultiwear(mWearableType)) + + if (LLWearableType::getAllowMultiwear(mWearableType)) { - disabled_items.push_back(std::string("Wearable Add")); + items.push_back(std::string("Wearable Add")); + if (gAgentWearables.getWearableCount(mWearableType) > 0) + { + disabled_items.push_back(std::string("Wearable Add")); + } } break; default: |