diff options
author | Dmitry Zaporozhan <dzaporozhan@productengine.com> | 2009-12-02 16:53:13 +0200 |
---|---|---|
committer | Dmitry Zaporozhan <dzaporozhan@productengine.com> | 2009-12-02 16:53:13 +0200 |
commit | 963c2240f4584f16b5e003b506c8c608331d8585 (patch) | |
tree | f7235245c031c968943188e6219003d54142a368 /indra/newview/llscriptfloater.cpp | |
parent | 276b782b8cfd7c814b84bbbf51fba5007f6c6031 (diff) |
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
Diffstat (limited to 'indra/newview/llscriptfloater.cpp')
-rw-r--r-- | indra/newview/llscriptfloater.cpp | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/indra/newview/llscriptfloater.cpp b/indra/newview/llscriptfloater.cpp index 155172128b..ad95c8b06e 100644 --- a/indra/newview/llscriptfloater.cpp +++ b/indra/newview/llscriptfloater.cpp @@ -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(); } |