EXT-580 Add Friend button in the IM floater not disabled if already friends

EXT-579 Add Friend from the Im floater opens multiple invitation dialogs
sidebar should be up above bottom tray
reviewed by richard

1 files changed, 2 insertions, 4 deletions

diff --git a/indra/newview/llimpanel.cpp b/indra/newview/llimpanel.cpp
index 954da8abd7..0b4e0f9317 100644
--- a/indra/newview/llimpanel.cpp
+++ b/indra/newview/llimpanel.cpp
@@ -2151,8 +2151,7 @@ void* LLIMFloater::createPanelIMControl(void* userdata)
 {
 	LLIMFloater *self = (LLIMFloater*)userdata;
 	self->mControlPanel = new LLPanelIMControlPanel();
-	LLUICtrlFactory::getInstance()->buildPanel(self->mControlPanel, "panel_im_control_panel.xml");
-	self->mControlPanel->setVisible(FALSE);
+	self->mControlPanel->setXMLFilename("panel_im_control_panel.xml");
 	return self->mControlPanel;
 }
 
@@ -2162,8 +2161,7 @@ void* LLIMFloater::createPanelGroupControl(void* userdata)
 {
 	LLIMFloater *self = (LLIMFloater*)userdata;
 	self->mControlPanel = new LLPanelGroupControlPanel();
-	LLUICtrlFactory::getInstance()->buildPanel(self->mControlPanel, "panel_group_control_panel.xml");
-	self->mControlPanel->setVisible(FALSE);
+	self->mControlPanel->setXMLFilename("panel_group_control_panel.xml");
 	return self->mControlPanel;
 }