diff options
| author | Leyla Farazha <leyla@lindenlab.com> | 2010-07-06 17:51:07 -0700 |
|---|---|---|
| committer | Leyla Farazha <leyla@lindenlab.com> | 2010-07-06 17:51:07 -0700 |
| commit | 33d1aa30ab25cd0a0fd4bbd6728b1277e73c45d2 (patch) | |
| tree | aa737a3258a409e539f378744b990294bac6115d /indra/newview/llfloaterscriptdebug.cpp | |
| parent | 86ba458ebcc979bdd03b490842311bd5621fb0b4 (diff) | |
| parent | dc6c35e353b991db2651d26bc76e5b3ee9921157 (diff) | |
Merge from dessie/viewer-release
Diffstat (limited to 'indra/newview/llfloaterscriptdebug.cpp')
| -rw-r--r-- | indra/newview/llfloaterscriptdebug.cpp | 8 |
1 files changed, 7 insertions, 1 deletions
diff --git a/indra/newview/llfloaterscriptdebug.cpp b/indra/newview/llfloaterscriptdebug.cpp index d6732a9d5c..4a82f3a11c 100644 --- a/indra/newview/llfloaterscriptdebug.cpp +++ b/indra/newview/llfloaterscriptdebug.cpp @@ -63,6 +63,8 @@ LLFloaterScriptDebug::LLFloaterScriptDebug(const LLSD& key) // avoid resizing of the window to match // the initial size of the tabbed-childs, whenever a tab is opened or closed mAutoResize = FALSE; + // enabled autocous blocks controling focus via LLFloaterReg::showInstance + setAutoFocus(FALSE); } LLFloaterScriptDebug::~LLFloaterScriptDebug() @@ -93,7 +95,8 @@ LLFloater* LLFloaterScriptDebug::addOutputWindow(const LLUUID &object_id) return NULL; LLFloater::setFloaterHost(host); - LLFloater* floaterp = LLFloaterReg::showInstance("script_debug_output", object_id); + // prevent stealing focus, see EXT-8040 + LLFloater* floaterp = LLFloaterReg::showInstance("script_debug_output", object_id, FALSE); LLFloater::setFloaterHost(NULL); return floaterp; @@ -145,6 +148,9 @@ LLFloaterScriptDebugOutput::LLFloaterScriptDebugOutput(const 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); } BOOL LLFloaterScriptDebugOutput::postBuild() |