diff options
author | Oz Linden <oz@lindenlab.com> | 2010-10-12 08:47:26 -0400 |
---|---|---|
committer | Oz Linden <oz@lindenlab.com> | 2010-10-12 08:47:26 -0400 |
commit | 3f43a36d3430e94046d40cb898a9fd34cce0f7d5 (patch) | |
tree | c3c483b3ce49ea5fcabe3041213223112edfba86 /indra/newview/llfloaterscriptdebug.cpp | |
parent | 422780c88a98ad0b78c54a71189219de12992bc2 (diff) | |
parent | 011f6f9ad07d0a71c9a392f5e25af2aad69110ee (diff) |
merge fixes for VWR-23296
Diffstat (limited to 'indra/newview/llfloaterscriptdebug.cpp')
-rw-r--r-- | indra/newview/llfloaterscriptdebug.cpp | 4 |
1 files changed, 0 insertions, 4 deletions
diff --git a/indra/newview/llfloaterscriptdebug.cpp b/indra/newview/llfloaterscriptdebug.cpp index 118dea2c74..a0d1a32e12 100644 --- a/indra/newview/llfloaterscriptdebug.cpp +++ b/indra/newview/llfloaterscriptdebug.cpp @@ -52,8 +52,6 @@ LLFloaterScriptDebug::LLFloaterScriptDebug(const LLSD& key) : LLMultiFloater(key) { -// LLUICtrlFactory::getInstance()->buildFloater(this, "floater_script_debug.xml"); - // avoid resizing of the window to match // the initial size of the tabbed-childs, whenever a tab is opened or closed mAutoResize = FALSE; @@ -141,8 +139,6 @@ LLFloaterScriptDebugOutput::LLFloaterScriptDebugOutput(const LLSD& object_id) : LLFloater(LLSD(object_id)), mObjectID(object_id.asUUID()) { - //LLUICtrlFactory::getInstance()->buildFloater(this, "floater_script_debug_panel.xml"); - // enabled autocous blocks controling focus via LLFloaterReg::showInstance setAutoFocus(FALSE); } |