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

2 files changed, 14 insertions, 3 deletions

diff --git a/indra/llui/llpanel.cpp b/indra/llui/llpanel.cpp
index 1a948fdd00..da55ababab 100644
--- a/indra/llui/llpanel.cpp
+++ b/indra/llui/llpanel.cpp
@@ -94,7 +94,8 @@ LLPanel::LLPanel(const LLPanel::Params& p)
 	mBorder(NULL),
 	mLabel(p.label),
 	mCommitCallbackRegistrar(false),
-	mEnableCallbackRegistrar(false)
+	mEnableCallbackRegistrar(false),
+	mXMLFilename("")
 {
 	setIsChrome(FALSE);
 
@@ -486,8 +487,13 @@ BOOL LLPanel::initPanelXML(LLXMLNodePtr node, LLView *parent, LLXMLNodePtr outpu
 		LLFastTimer timer(FTM_PANEL_SETUP);
 
 		LLXMLNodePtr referenced_xml;
-		std::string xml_filename;
-		node->getAttributeString("filename", xml_filename);
+		std::string xml_filename = mXMLFilename;
+		
+		// if the panel didn't provide a filename, check the node
+		if (xml_filename.empty())
+		{
+			node->getAttributeString("filename", xml_filename);
+		}
 
 		if (!xml_filename.empty())
 		{
diff --git a/indra/llui/llpanel.h b/indra/llui/llpanel.h
index 552a621a8e..2a70467ffc 100644
--- a/indra/llui/llpanel.h
+++ b/indra/llui/llpanel.h
@@ -249,6 +249,8 @@ public:
 
 	//call onOpen to let panel know when it's about to be shown or activated
 	virtual void	onOpen(const LLSD& key) {}
+
+	void setXMLFilename(std::string filename) { mXMLFilename = filename; };
 	
 protected:
 	// Override to set not found list
@@ -278,6 +280,9 @@ private:
 	ui_string_map_t	mUIStrings;
 
 	std::string		mRequirementsError;
+
+	// for setting the xml filename when building panel in context dependent cases
+	std::string		mXMLFilename;
 	
 }; // end class LLPanel