summaryrefslogtreecommitdiff
path: root/indra
diff options
context:
space:
mode:
authorYuri Chebotarev <ychebotarev@productengine.com>2010-06-24 14:58:04 +0300
committerYuri Chebotarev <ychebotarev@productengine.com>2010-06-24 14:58:04 +0300
commit16eeea4cc52e512b3a27b7d9123344367f2bb79c (patch)
tree4b20ef4fb5c5a9ac28587c8c0ff6ae8801b8a95a /indra
parentc0fd8b1548dbda60f20435c120585e2454df6ffb (diff)
EXT-7975 FIX Didn't show menu if there is no work clothing among selected items
reviwed by Neal Orman at https://codereview.productengine.com/secondlife/r/635/ --HG-- branch : product-engine
Diffstat (limited to 'indra')
-rw-r--r--indra/newview/llcofwearables.cpp15
1 files changed, 14 insertions, 1 deletions
diff --git a/indra/newview/llcofwearables.cpp b/indra/newview/llcofwearables.cpp
index aa8cc01f7d..1926682a39 100644
--- a/indra/newview/llcofwearables.cpp
+++ b/indra/newview/llcofwearables.cpp
@@ -608,7 +608,20 @@ void LLCOFWearables::onListRightClick(LLUICtrl* ctrl, S32 x, S32 y, LLListContex
uuid_vec_t selected_uuids;
if(getSelectedUUIDs(selected_uuids))
{
- menu->show(ctrl, selected_uuids, x, y);
+ bool show_menu = false;
+ for(uuid_vec_t::iterator it = selected_uuids.begin();it!=selected_uuids.end();++it)
+ {
+ if ((*it).notNull())
+ {
+ show_menu = true;
+ break;
+ }
+ }
+
+ if(show_menu)
+ {
+ menu->show(ctrl, selected_uuids, x, y);
+ }
}
}
}