From 16eeea4cc52e512b3a27b7d9123344367f2bb79c Mon Sep 17 00:00:00 2001 From: Yuri Chebotarev Date: Thu, 24 Jun 2010 14:58:04 +0300 Subject: 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 --- indra/newview/llcofwearables.cpp | 15 ++++++++++++++- 1 file changed, 14 insertions(+), 1 deletion(-) 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); + } } } } -- cgit v1.2.3