summaryrefslogtreecommitdiff
path: root/indra/newview/llchathistory.cpp
diff options
context:
space:
mode:
authorPaul ProductEngine <pguslisty@productengine.com>2011-09-27 22:51:43 +0300
committerPaul ProductEngine <pguslisty@productengine.com>2011-09-27 22:51:43 +0300
commit8fd2d69fdf47e0f586c6010c589411e251967038 (patch)
tree0372e97bd99830466611f7a2f4c77ed1b90ccf5c /indra/newview/llchathistory.cpp
parent679a028fcc5615b9725bf11f6949634617fad06d (diff)
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.
Diffstat (limited to 'indra/newview/llchathistory.cpp')
-rw-r--r--indra/newview/llchathistory.cpp3
1 files changed, 2 insertions, 1 deletions
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()));
}
}