diff options
author | Loren Shih <seraph@lindenlab.com> | 2009-12-04 13:50:32 -0500 |
---|---|---|
committer | Loren Shih <seraph@lindenlab.com> | 2009-12-04 13:50:32 -0500 |
commit | c9c9943098d35914f7b8591bf66ea1ae3985a94e (patch) | |
tree | daa74a4288a0e5e5c028717e0b925633c11eac5b /indra/newview/llviewermessage.cpp | |
parent | 92a1ecd5fdfff2490cb563e83baff88fc6120882 (diff) | |
parent | 5b695ac56a7fbbb4d1f63bccb0c147c46e56ebcf (diff) |
automated merge viewer2.0->avp
--HG--
branch : avatar-pipeline
Diffstat (limited to 'indra/newview/llviewermessage.cpp')
-rw-r--r-- | indra/newview/llviewermessage.cpp | 11 |
1 files changed, 0 insertions, 11 deletions
diff --git a/indra/newview/llviewermessage.cpp b/indra/newview/llviewermessage.cpp index 65ad2f6fa6..507e34348b 100644 --- a/indra/newview/llviewermessage.cpp +++ b/indra/newview/llviewermessage.cpp @@ -5506,17 +5506,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()); } //--------------------------------------------------------------------------- |