From 8fd2d69fdf47e0f586c6010c589411e251967038 Mon Sep 17 00:00:00 2001
From: Paul ProductEngine <pguslisty@productengine.com>
Date: Tue, 27 Sep 2011 22:51:43 +0300
Subject: EXP-1224 FIXED (Create and register a floater for People side tab)

- Added a floater for People side tab.
- Replaced calls to LLSideTray with LLFloaterSidePanelContainer.
---
 indra/newview/llchathistory.cpp | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

(limited to 'indra/newview/llchathistory.cpp')

diff --git a/indra/newview/llchathistory.cpp b/indra/newview/llchathistory.cpp
index c0c9ea1451..d6773b8b29 100644
--- a/indra/newview/llchathistory.cpp
+++ b/indra/newview/llchathistory.cpp
@@ -42,6 +42,7 @@
 #include "llavataractions.h"
 #include "lltrans.h"
 #include "llfloaterreg.h"
+#include "llfloatersidepanelcontainer.h"
 #include "llmutelist.h"
 #include "llstylemap.h"
 #include "llslurl.h"
@@ -144,7 +145,7 @@ public:
 		{
 			LLMuteList::getInstance()->add(LLMute(getAvatarId(), mFrom, LLMute::OBJECT));
 
-			LLSideTray::getInstance()->showPanel("panel_block_list_sidetray", LLSD().with("blocked_to_select", getAvatarId()));
+			LLFloaterSidePanelContainer::showPanel("people", "panel_block_list_sidetray", LLSD().with("blocked_to_select", getAvatarId()));
 		}
 	}
 
-- 
cgit v1.2.3


From 9d3fc5d930bd1dae07771350080e5140c0113891 Mon Sep 17 00:00:00 2001
From: Paul ProductEngine <pguslisty@productengine.com>
Date: Thu, 29 Sep 2011 21:43:07 +0300
Subject: EXP-1209 FIXED Sidetray removed.

- Removed all sidetray dependencies and the sidetray itself.

- Also removed LLFloaterSidetrayTab and LLSidetrayListener as unused.
---
 indra/newview/llchathistory.cpp | 2 --
 1 file changed, 2 deletions(-)

(limited to 'indra/newview/llchathistory.cpp')

diff --git a/indra/newview/llchathistory.cpp b/indra/newview/llchathistory.cpp
index d6773b8b29..7a444edd43 100644
--- a/indra/newview/llchathistory.cpp
+++ b/indra/newview/llchathistory.cpp
@@ -59,8 +59,6 @@
 
 #include "llviewercontrol.h"
 
-#include "llsidetray.h"//for blocked objects panel
-
 static LLDefaultChildRegistry::Register<LLChatHistory> r("chat_history");
 
 const static std::string NEW_LINE(rawstr_to_utf8("\n"));
-- 
cgit v1.2.3