livie
/
phoenix-firestorm
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Update for normal task EXT-2081 - Object IM chiclets art needs to be hooked up to LLDialog chiclets. 

Disabled notification toast.

--HG--
branch : product-engine
meow-7.2.2
Dmitry Zaporozhan 2009-12-02 16:53:13 +02:00
parent 276b782b8c
commit 963c2240f4
3 changed files with 4 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
indra/newview/llscriptfloater.cpp
View File

@ -62,7 +62,7 @@ LLUUID notification_id_to_object_id(const LLUUID& notification_id)
//////////////////////////////////////////////////////////////////////////
LLScriptFloater::LLScriptFloater(const LLSD& key)
: LLTransientDockableFloater(NULL, true, key)
: LLDockableFloater(NULL, true, key)
, mScriptForm(NULL)
, mObjectId(key.asUUID())
{
@ -161,14 +161,14 @@ void LLScriptFloater::onClose(bool app_quitting)
void LLScriptFloater::setDocked(bool docked, bool pop_on_undock /* = true */)
{
LLTransientDockableFloater::setDocked(docked, pop_on_undock);
LLDockableFloater::setDocked(docked, pop_on_undock);
hideToastsIfNeeded();
}
void LLScriptFloater::setVisible(BOOL visible)
{
LLTransientDockableFloater::setVisible(visible);
LLDockableFloater::setVisible(visible);
hideToastsIfNeeded();
}

2
indra/newview/llscriptfloater.h
View File

@ -102,7 +102,7 @@ private:
* LLScriptFloater will create script form based on notification data and
* will auto fit the form.
*/
class LLScriptFloater : public LLTransientDockableFloater
class LLScriptFloater : public LLDockableFloater
{
public:

11
indra/newview/llviewermessage.cpp
View File

@ -5583,17 +5583,6 @@ void process_script_dialog(LLMessageSystem* msg, void**)
notification = LLNotifications::instance().add(
LLNotification::Params("ScriptDialogGroup").substitutions(args).payload(payload).form_elements(form.asLLSD()));
}
// "ScriptDialog" and "ScriptDialogGroup" are handles by LLScriptFloaterManager.
// We want to inform user that there is a script floater, lets add "ScriptToast"
LLNotification::Params p("ScriptToast");
p.substitutions(args).payload(payload).functor.function(boost::bind(
LLScriptFloaterManager::onToastButtonClick, _1, _2));
notification = LLNotifications::instance().add(p);
LLScriptFloaterManager::getInstance()->setNotificationToastId(
object_id, notification->getID());
}
//---------------------------------------------------------------------------