diff options
author | Oz Linden <oz@lindenlab.com> | 2011-03-16 21:22:45 -0400 |
---|---|---|
committer | Oz Linden <oz@lindenlab.com> | 2011-03-16 21:22:45 -0400 |
commit | 31edad0a226a14b5b87fe364c629f8450bda567c (patch) | |
tree | e03ed820a759cd5d5c5f4f930762f73b0fe4cf24 /indra/newview/lllocationinputctrl.cpp | |
parent | b6e6ba224620e0b122062c88f40295c10ce8db2d (diff) | |
parent | 742dd75751f65224d80eb4f7d20daf5a21776c5f (diff) |
merge changes for storm-357
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 |