diff options
author | Oz Linden <oz@lindenlab.com> | 2011-03-17 14:56:01 -0400 |
---|---|---|
committer | Oz Linden <oz@lindenlab.com> | 2011-03-17 14:56:01 -0400 |
commit | f64a20ddcff91677b02b7688e08819cffb0989c9 (patch) | |
tree | 707b1430e5b7ef2e27f4f34c66822e92dfffd294 /indra/newview/lllocationinputctrl.cpp | |
parent | c077250ff16aeaf0ec4c036154a427c677e85eb3 (diff) | |
parent | 17d87b0fa5bdd8d15dbcd98e65c30ebf4e5b94ec (diff) |
merge changes for storm-1016
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 |