diff options
| author | Dmitry Zaporozhan <dzaporozhan@productengine.com> | 2010-02-19 16:13:15 +0200 |
|---|---|---|
| committer | Dmitry Zaporozhan <dzaporozhan@productengine.com> | 2010-02-19 16:13:15 +0200 |
| commit | 5ea72c3087fe7a45da90437b8ff2a6ba0759ceb4 (patch) | |
| tree | b0a9b9c4804418ebbad6ffafba2d7caf9d49586f /indra/newview | |
| parent | 5cc02625fb15203cec8584aa19dd8d2240ab8eca (diff) | |
Fixed major bug EXT-5445 - Pop-ups (that replace the blue ones) should not steal focus.
LLScriptFloater will no longer steal focus when opened.
--HG--
branch : product-engine
Diffstat (limited to 'indra/newview')
| -rw-r--r-- | indra/newview/llscriptfloater.cpp | 8 | ||||
| -rw-r--r-- | indra/newview/skins/default/xui/en/floater_script.xml | 2 |
2 files changed, 7 insertions, 3 deletions
diff --git a/indra/newview/llscriptfloater.cpp b/indra/newview/llscriptfloater.cpp index d452ef2228..a88a242fbe 100644 --- a/indra/newview/llscriptfloater.cpp +++ b/indra/newview/llscriptfloater.cpp @@ -88,7 +88,7 @@ bool LLScriptFloater::toggle(const LLUUID& notification_id) else { floater->setVisible(TRUE); - floater->setFocus(TRUE); + floater->setFocus(FALSE); } } // create and show new floater @@ -107,6 +107,9 @@ LLScriptFloater* LLScriptFloater::show(const LLUUID& notification_id) floater->setNotificationId(notification_id); floater->createForm(notification_id); + //LLDialog(LLGiveInventory and LLLoadURL) should no longer steal focus (see EXT-5445) + floater->setAutoFocus(FALSE); + if(LLScriptFloaterManager::OBJ_SCRIPT == LLScriptFloaterManager::getObjectType(notification_id)) { floater->setSavePosition(true); @@ -117,7 +120,8 @@ LLScriptFloater* LLScriptFloater::show(const LLUUID& notification_id) floater->dockToChiclet(true); } - LLFloaterReg::showTypedInstance<LLScriptFloater>("script_floater", notification_id, TRUE); + //LLDialog(LLGiveInventory and LLLoadURL) should no longer steal focus (see EXT-5445) + LLFloaterReg::showTypedInstance<LLScriptFloater>("script_floater", notification_id, FALSE); return floater; } diff --git a/indra/newview/skins/default/xui/en/floater_script.xml b/indra/newview/skins/default/xui/en/floater_script.xml index 984c4fcf1d..663899d4b3 100644 --- a/indra/newview/skins/default/xui/en/floater_script.xml +++ b/indra/newview/skins/default/xui/en/floater_script.xml @@ -10,7 +10,7 @@ top="0" can_dock="true" can_minimize="true" - visible="true" + visible="false" width="520" can_resize="false" min_width="350" |