diff options
author | Oz Linden <oz@lindenlab.com> | 2011-03-24 07:48:06 -0400 |
---|---|---|
committer | Oz Linden <oz@lindenlab.com> | 2011-03-24 07:48:06 -0400 |
commit | 4386bb173b17ca499e0c63809b8c7227da3f0e1c (patch) | |
tree | 7893d4c6d3eccfaf0839d48618b32de5628cd218 /indra/newview/lllocationinputctrl.cpp | |
parent | eef9b265b951337d0633d18186dad2b734b30d5a (diff) | |
parent | 1c375a8c880354432da2b218c321ed708497e161 (diff) |
merge changes for storm-1018
Diffstat (limited to 'indra/newview/lllocationinputctrl.cpp')
-rw-r--r-- | indra/newview/lllocationinputctrl.cpp | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/indra/newview/lllocationinputctrl.cpp b/indra/newview/lllocationinputctrl.cpp index 55164f6094..5c65dcec34 100644 --- a/indra/newview/lllocationinputctrl.cpp +++ b/indra/newview/lllocationinputctrl.cpp @@ -211,7 +211,6 @@ LLLocationInputCtrl::LLLocationInputCtrl(const LLLocationInputCtrl::Params& p) { // Lets replace default LLLineEditor with LLLocationLineEditor // to make needed escaping while copying and cutting url - this->removeChild(mTextEntry); delete mTextEntry; // Can't access old mTextEntry fields as they are protected, so lets build new params |