diff options
| author | Tofu Linden <tofu.linden@lindenlab.com> | 2010-02-05 07:35:03 +0000 |
|---|---|---|
| committer | Tofu Linden <tofu.linden@lindenlab.com> | 2010-02-05 07:35:03 +0000 |
| commit | 197c78fa4bf372d09b315b1bad3cf6649627eb48 (patch) | |
| tree | d49217ad4a9b10fa907cfbefeba1453042b66f9a /indra/newview/lllocationinputctrl.cpp | |
| parent | 05e15ccb82541494bf7145652140de187d838cda (diff) | |
| parent | 367fda833cb5633564c2518f613a00484eb73ec5 (diff) | |
merge from viewer2 trunk.
Diffstat (limited to 'indra/newview/lllocationinputctrl.cpp')
| -rw-r--r-- | indra/newview/lllocationinputctrl.cpp | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/indra/newview/lllocationinputctrl.cpp b/indra/newview/lllocationinputctrl.cpp index 4f40a0a532..1b7ad6ab7e 100644 --- a/indra/newview/lllocationinputctrl.cpp +++ b/indra/newview/lllocationinputctrl.cpp @@ -227,6 +227,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); addChild(mTextEntry); // LLLineEditor is replaced with LLLocationLineEditor |