diff options
author | Logan Dethrow <log@lindenlab.com> | 2011-10-19 13:04:54 -0400 |
---|---|---|
committer | Logan Dethrow <log@lindenlab.com> | 2011-10-19 13:04:54 -0400 |
commit | 77876a3c4f18b480f9afd17be57b123d2e5f1e84 (patch) | |
tree | 04b31f26cceef5cc411b166d30eb694707d995aa /indra/newview/llchiclet.cpp | |
parent | e0f6e449594c44511d9634ea54faf54f8fe5cb7c (diff) | |
parent | dd61baa3401a09bd8ff1e894514c15390946cdb3 (diff) |
Merged with viewer-development.
Diffstat (limited to 'indra/newview/llchiclet.cpp')
-rw-r--r-- | indra/newview/llchiclet.cpp | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/indra/newview/llchiclet.cpp b/indra/newview/llchiclet.cpp index 245157923d..a076374903 100644 --- a/indra/newview/llchiclet.cpp +++ b/indra/newview/llchiclet.cpp @@ -29,7 +29,7 @@ #include "llagent.h" #include "llavataractions.h" -#include "llbottomtray.h" +#include "llchicletbar.h" #include "lleventtimer.h" #include "llgroupactions.h" #include "lliconctrl.h" @@ -214,10 +214,10 @@ void LLSysWellChiclet::updateWidget(bool is_window_empty) { mButton->setEnabled(!is_window_empty); - LLSD params; - params["well_empty"] = is_window_empty; - params["well_name"] = getName(); - notifyParent(params); + if (LLChicletBar::instanceExists()) + { + LLChicletBar::getInstance()->showWellButton(getName(), !is_window_empty); + } } // virtual BOOL LLSysWellChiclet::handleRightMouseDown(S32 x, S32 y, MASK mask) @@ -297,7 +297,7 @@ void LLIMWellChiclet::createMenu() void LLIMWellChiclet::messageCountChanged(const LLSD& session_data) { const LLUUID& session_id = session_data["session_id"]; - const S32 counter = LLBottomTray::getInstance()->getTotalUnreadIMCount(); + const S32 counter = LLChicletBar::getInstance()->getTotalUnreadIMCount(); const bool im_not_visible = !LLFloaterReg::instanceVisible("im_container") && !LLFloaterReg::instanceVisible("impanel", session_id); |