svn merge -r64837:65485 svn+ssh://svn.lindenlab.com/svn/linden/branches/maintenance --> release

(only inside indra)

(josh) Original log message was:
   svn merge -r64837:65485 svn+ssh://svn.lindenlab.com/svn/linden/branches/maintenance
bos updated it to be:
   svn merge -r64837:65269 svn+ssh://svn.lindenlab.com/svn/linden/branches/maintenance
However, it appears it actually was:
   svn merge -r64837:65485 svn+ssh://svn.lindenlab.com/svn/linden/branches/maintenance
... missing some file additions.

1 files changed, 9 insertions, 0 deletions

diff --git a/indra/newview/llimview.cpp b/indra/newview/llimview.cpp
index 5a40b4a7c1..336da9ac79 100644
--- a/indra/newview/llimview.cpp
+++ b/indra/newview/llimview.cpp
@@ -111,6 +111,11 @@ static LLUUID compute_session_id(EInstantMessage dialog,
 
 LLFloaterIM::LLFloaterIM() 
 {
+	// autoresize=false is necessary to avoid resizing of the IM window whenever 
+	// a session is opened or closed (it would otherwise resize the window to match
+	// the size of the im-sesssion when they were created.  This happens in 
+	// LLMultiFloater::resizeToContents() when called through LLMultiFloater::addFloater())
+	this->mAutoResize = FALSE;
 	gUICtrlFactory->buildFloater(this, "floater_im.xml");
 }
 
@@ -186,12 +191,16 @@ void LLFloaterIM::onClose(bool app_quitting)
 //virtual
 void LLFloaterIM::addFloater(LLFloater* floaterp, BOOL select_added_floater, LLTabContainer::eInsertionPoint insertion_point)
 {
+/*
+	Code removed via patch from VWR-1626
+
 	// this code is needed to fix the bug where new IMs received will resize the IM floater.
 	// SL-29075, SL-24556, and others
 	LLRect parent_rect = getRect();
 	S32 dheight = LLFLOATER_HEADER_SIZE + TABCNTR_HEADER_HEIGHT;
 	LLRect rect(0, parent_rect.getHeight()-dheight, parent_rect.getWidth(), 0);
 	floaterp->reshape(rect.getWidth(), rect.getHeight(), TRUE);
+*/
 	LLMultiFloater::addFloater(floaterp, select_added_floater, insertion_point);
 }