diff options
| author | simon <simon@lindenlab.com> | 2024-01-03 01:34:58 +0000 |
|---|---|---|
| committer | simon <simon@lindenlab.com> | 2024-01-03 01:34:58 +0000 |
| commit | 520f710cd6b5826403383f8c3488a94c64ac8081 (patch) | |
| tree | 3936a248d991e11b82768ff10a5079789299bb53 /indra/newview/lllocationinputctrl.cpp | |
| parent | d4c3300f9b81296f765c83c1e822251e86d91925 (diff) | |
| parent | a592292242e29d0379ee72572a434359e1e892d1 (diff) | |
Merge remote-tracking branch 'origin/main' into simon/sl-20635-new-data
Diffstat (limited to 'indra/newview/lllocationinputctrl.cpp')
| -rw-r--r-- | indra/newview/lllocationinputctrl.cpp | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/indra/newview/lllocationinputctrl.cpp b/indra/newview/lllocationinputctrl.cpp index d6f3068610..9fa35e3bd9 100644 --- a/indra/newview/lllocationinputctrl.cpp +++ b/indra/newview/lllocationinputctrl.cpp @@ -391,7 +391,9 @@ LLLocationInputCtrl::LLLocationInputCtrl(const LLLocationInputCtrl::Params& p) LL_WARNS() << "Error loading navigation bar context menu" << LL_ENDL; } - getTextEntry()->setRightMouseUpCallback(boost::bind(&LLLocationInputCtrl::onTextEditorRightClicked,this,_2,_3,_4)); + //don't show default context menu + getTextEntry()->setShowContextMenu(false); + getTextEntry()->setRightMouseDownCallback(boost::bind(&LLLocationInputCtrl::onTextEditorRightClicked, this, _2, _3, _4)); updateWidgetlayout(); // Connecting signal for updating location on "Show Coordinates" setting change. |