summaryrefslogtreecommitdiff
path: root/indra/newview/lllocationinputctrl.cpp
diff options
context:
space:
mode:
authorTofu Linden <tofu.linden@lindenlab.com>2010-02-05 06:21:09 +0000
committerTofu Linden <tofu.linden@lindenlab.com>2010-02-05 06:21:09 +0000
commit367fda833cb5633564c2518f613a00484eb73ec5 (patch)
treecc98e6d0c1a2fb2b045c19785ccc4a8b6f067bda /indra/newview/lllocationinputctrl.cpp
parent7d2d8ea58f572a6df08b04f64f3b71501ee21f6c (diff)
parentf60afe790b156051f1da72abea2ea64731c704ac (diff)
PE merge.
Diffstat (limited to 'indra/newview/lllocationinputctrl.cpp')
-rw-r--r--indra/newview/lllocationinputctrl.cpp1
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