diff options
| author | Mnikolenko Productengine <mnikolenko@productengine.com> | 2018-01-09 14:12:00 +0200 |
|---|---|---|
| committer | Mnikolenko Productengine <mnikolenko@productengine.com> | 2018-01-09 14:12:00 +0200 |
| commit | 0af4e93e7611485b33aec27bd49749c0226dbf29 (patch) | |
| tree | 9ffd3e451630612afb4800c899b273594e0e9f16 /indra | |
| parent | 472decad98ef8da6a7e3b992c193fdb0c93f9878 (diff) | |
MAINT-8157 Crash in LLWearableBridge::buildContextMenu(..)
Diffstat (limited to 'indra')
| -rw-r--r-- | indra/newview/llinventorybridge.cpp | 4 |
1 files changed, 1 insertions, 3 deletions
diff --git a/indra/newview/llinventorybridge.cpp b/indra/newview/llinventorybridge.cpp index 3acfaeb049..67b51f11b3 100644 --- a/indra/newview/llinventorybridge.cpp +++ b/indra/newview/llinventorybridge.cpp @@ -6588,11 +6588,9 @@ void LLWearableBridge::buildContextMenu(LLMenuGL& menu, U32 flags) getClipboardEntries(true, items, disabled_items, flags); items.push_back(std::string("Wearable And Object Separator")); - items.push_back(std::string("Wearable Edit")); - bool modifiable = !gAgentWearables.isWearableModifiable(item->getUUID()); - if (((flags & FIRST_SELECTED_ITEM) == 0) || modifiable) + if (((flags & FIRST_SELECTED_ITEM) == 0) || (item && !gAgentWearables.isWearableModifiable(item->getUUID()))) { disabled_items.push_back(std::string("Wearable Edit")); } |