diff options
author | richard <none@none> | 2009-11-10 12:05:36 -0800 |
---|---|---|
committer | richard <none@none> | 2009-11-10 12:05:36 -0800 |
commit | 595000c19c0499a0b612c272cd097a8f1ca578bd (patch) | |
tree | dc88a193c3275b23bcc2efb1180ff5eb1e90fac9 /indra/newview/llbottomtray.cpp | |
parent | ecf8f5c5beda9f5fa743c4666717c4378f204023 (diff) | |
parent | 1eaab29a95439c6688c903b224e660de0fc9a053 (diff) |
merge
Diffstat (limited to 'indra/newview/llbottomtray.cpp')
-rw-r--r-- | indra/newview/llbottomtray.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/indra/newview/llbottomtray.cpp b/indra/newview/llbottomtray.cpp index e5cc2fce88..832694873f 100644 --- a/indra/newview/llbottomtray.cpp +++ b/indra/newview/llbottomtray.cpp @@ -70,7 +70,7 @@ LLBottomTray::LLBottomTray(const LLSD&) //this is to fix a crash that occurs because LLBottomTray is a singleton //and thus is deleted at the end of the viewers lifetime, but to be cleanly //destroyed LLBottomTray requires some subsystems that are long gone - LLUI::getRootView()->addChild(this); + //LLUI::getRootView()->addChild(this); // Necessary for focus movement among child controls setFocusRoot(TRUE); |