diff options
| author | Ychebotarev ProductEngine <ychebotarev@productengine.com> | 2010-02-09 14:57:03 +0200 |
|---|---|---|
| committer | Ychebotarev ProductEngine <ychebotarev@productengine.com> | 2010-02-09 14:57:03 +0200 |
| commit | 2dc2c6e0090788566883082d8abacde3d134144b (patch) | |
| tree | 744389f0b405b40926a43020e1cb65a1f1b80396 /indra/newview/llscriptfloater.cpp | |
| parent | b16030e204df225e81c88c97bcdb691dbaef77a3 (diff) | |
| parent | 886de22d577ca1e304ece5efddc34f62ead00ce4 (diff) | |
merge
--HG--
branch : product-engine
Diffstat (limited to 'indra/newview/llscriptfloater.cpp')
| -rw-r--r-- | indra/newview/llscriptfloater.cpp | 12 |
1 files changed, 5 insertions, 7 deletions
diff --git a/indra/newview/llscriptfloater.cpp b/indra/newview/llscriptfloater.cpp index 465d36b8de..a81ec61263 100644 --- a/indra/newview/llscriptfloater.cpp +++ b/indra/newview/llscriptfloater.cpp @@ -74,9 +74,6 @@ LLScriptFloater::LLScriptFloater(const LLSD& key) bool LLScriptFloater::toggle(const LLUUID& notification_id) { - // Force chiclet toggle on here because first onFocusReceived() will not toggle it on. - LLBottomTray::getInstance()->getChicletPanel()->setChicletToggleState(notification_id, true); - LLScriptFloater* floater = LLFloaterReg::findTypedInstance<LLScriptFloater>("script_floater", notification_id); // show existing floater @@ -91,23 +88,24 @@ bool LLScriptFloater::toggle(const LLUUID& notification_id) { floater->setVisible(TRUE); floater->setFocus(TRUE); - return true; } } // create and show new floater else { show(notification_id); - return true; } + + LLBottomTray::getInstance()->getChicletPanel()->setChicletToggleState(notification_id, true); + return true; } LLScriptFloater* LLScriptFloater::show(const LLUUID& notification_id) { - LLScriptFloater* floater = LLFloaterReg::showTypedInstance<LLScriptFloater>("script_floater", notification_id); - + LLScriptFloater* floater = LLFloaterReg::getTypedInstance<LLScriptFloater>("script_floater", notification_id); floater->setNotificationId(notification_id); floater->createForm(notification_id); + LLFloaterReg::showTypedInstance<LLScriptFloater>("script_floater", notification_id, TRUE); if (floater->getDockControl() == NULL) { |