diff options
| author | Palmer Truelson <palmer@lindenlab.com> | 2010-02-22 14:20:50 -0800 |
|---|---|---|
| committer | Palmer Truelson <palmer@lindenlab.com> | 2010-02-22 14:20:50 -0800 |
| commit | dcbbf64c41aac85613591b51071b9453bdb1df0f (patch) | |
| tree | 4c6d654770aa53a2e1f1ca4b24ed9fa8d0a247dc /indra/newview/llscriptfloater.cpp | |
| parent | ca12b3d971db20559cb242417dc6c3f64d63c1d6 (diff) | |
| parent | 722c5fb92ebcf61190edc7ec29c8f5ea1f826cf9 (diff) | |
merge
Diffstat (limited to 'indra/newview/llscriptfloater.cpp')
| -rw-r--r-- | indra/newview/llscriptfloater.cpp | 8 |
1 files changed, 6 insertions, 2 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; } |