diff options
| author | Ruslan Teliuk <ruslantproductengine@lindenlab.com> | 2016-09-27 15:43:53 +0300 |
|---|---|---|
| committer | Ruslan Teliuk <ruslantproductengine@lindenlab.com> | 2016-09-27 15:43:53 +0300 |
| commit | 999dc6c61ba48c5bd930e63bfc6dc7d1e494b43c (patch) | |
| tree | 5c0f00f9521aa0298ff2813d5116cf4b12a04597 /indra/newview/lllocationinputctrl.cpp | |
| parent | 25c20f98a88a457b5fa865e8dc302b24378bc842 (diff) | |
| parent | fa4376b457b887130e98bd96e6bccb231e8947d2 (diff) | |
Merged lindenlab/viewer-neko into default
Diffstat (limited to 'indra/newview/lllocationinputctrl.cpp')
| -rw-r--r-- | indra/newview/lllocationinputctrl.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/indra/newview/lllocationinputctrl.cpp b/indra/newview/lllocationinputctrl.cpp index 53b2ca2b74..11bc1425f9 100644 --- a/indra/newview/lllocationinputctrl.cpp +++ b/indra/newview/lllocationinputctrl.cpp @@ -243,7 +243,7 @@ LLLocationInputCtrl::LLLocationInputCtrl(const LLLocationInputCtrl::Params& p) params.commit_on_focus_lost(false); params.follows.flags(FOLLOWS_ALL); mTextEntry = LLUICtrlFactory::create<LLURLLineEditor>(params); - mTextEntry->setContextMenu(NULL); + mTextEntry->resetContextMenu(); addChild(mTextEntry); // LLLineEditor is replaced with LLLocationLineEditor |