diff options
author | Loren Shih <seraph@lindenlab.com> | 2011-03-16 14:54:56 -0400 |
---|---|---|
committer | Loren Shih <seraph@lindenlab.com> | 2011-03-16 14:54:56 -0400 |
commit | 037a83cd47e016f70092bccfdb2c13e759c6ff0a (patch) | |
tree | 2183c8ef1364d5f4e784cb91ea4d67b1861b2452 /indra/newview/lllocationinputctrl.cpp | |
parent | 15b0509c01dbeec6854f4a0a5965e900eda06de1 (diff) | |
parent | 742dd75751f65224d80eb4f7d20daf5a21776c5f (diff) |
Automated merge up from viewer-development into mesh-development
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 |