diff options
| author | Loren Shih <seraph@lindenlab.com> | 2009-12-04 20:09:20 -0500 |
|---|---|---|
| committer | Loren Shih <seraph@lindenlab.com> | 2009-12-04 20:09:20 -0500 |
| commit | 23068a2e7d9086a212d8c1eb4318c762705ab31e (patch) | |
| tree | 794798909bb5c60a48507ca6efb24a72d16d3ce0 /indra/newview/llinventorybridge.cpp | |
| parent | add459cfd2245dd116392426f12ba04365b579de (diff) | |
| parent | 16efeb85817cce82e594cf8482f5e52385a59ad1 (diff) | |
automated merge avp->avp
--HG--
branch : avatar-pipeline
Diffstat (limited to 'indra/newview/llinventorybridge.cpp')
| -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 96e64051a2..4c28d5e2df 100644 --- a/indra/newview/llinventorybridge.cpp +++ b/indra/newview/llinventorybridge.cpp @@ -3776,8 +3776,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); } |