diff options
| author | Brad Payne (Vir Linden) <vir@lindenlab.com> | 2009-12-04 18:58:57 -0500 | 
|---|---|---|
| committer | Brad Payne (Vir Linden) <vir@lindenlab.com> | 2009-12-04 18:58:57 -0500 | 
| commit | f017058345ba1bc2682051017d3f9c0d6ea3db72 (patch) | |
| tree | 24ee1f2df627cdb093672d8eb385efada7695551 | |
| parent | 009c62f13e81b6dcc70c4abb2b9cccab56255a1c (diff) | |
For EXT-2845, EXT-2846: standardizing gesture context options to work like wearables and attachments
--HG--
branch : avatar-pipeline
| -rw-r--r-- | indra/newview/llinventorybridge.cpp | 10 | 
1 files changed, 8 insertions, 2 deletions
| diff --git a/indra/newview/llinventorybridge.cpp b/indra/newview/llinventorybridge.cpp index 5bfad0695c..2d30e30e58 100644 --- a/indra/newview/llinventorybridge.cpp +++ b/indra/newview/llinventorybridge.cpp @@ -3768,8 +3768,14 @@ void LLGestureBridge::buildContextMenu(LLMenuGL& menu, U32 flags)  		getClipboardEntries(true, items, disabled_items, flags);  		items.push_back(std::string("Gesture Separator")); -		items.push_back(std::string("Activate")); -		items.push_back(std::string("Deactivate")); +		if (LLGestureManager::instance().isGestureActive(getUUID())) +		{ +			items.push_back(std::string("Deactivate")); +		} +		else +		{ +			items.push_back(std::string("Activate")); +		}  	}  	hide_context_entries(menu, items, disabled_items);  } | 
