EXP-1285 FIXED Chiclets moved to the upper right of the viewer window.

- Floaters dock to chiclets at the bottom.
- Floaters docking region limited to non-toolbar view.
- Chiclet bar is positioned between the right toolbar and the minimized floaters stacked at the top left corner by default.

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);