CHUI-282 WIP Removed the hack added for CHUI-308 to resize the folder view in conversation list.

Fixed some glitches after automated merge.

indra/newview/llimfloatercontainer.cpp

@@ -80,8 +80,6 @@ LLIMFloaterContainer::~LLIMFloaterContainer()
 	{
 		LLIMMgr::getInstance()->removeSessionObserver(this);
 	}
-
-	gIdleCallbacks.deleteFunction(idle, (void*)this);
 }
 
 void LLIMFloaterContainer::sessionAdded(const LLUUID& session_id, const std::string& name, const LLUUID& other_participant_id)
@@ -171,8 +169,6 @@ BOOL LLIMFloaterContainer::postBuild()
         mConversationsPane->handleReshape(list_size, TRUE);
 	}
 
-	gIdleCallbacks.addFunction(idle, (void*)this);
-
 	mInitialized = true;
 
 	// Add callback: we'll take care of view updates on idle
@@ -390,13 +386,6 @@ void LLIMFloaterContainer::draw()
 		}
 	}
 	
-	// CHUI-308 : Hack! We shouldn't have to do that but we have too as long as
-	// we don't have a scroll container.
-	// *TODO: Take those 3 lines out once we implement the scroll container.
-	repositioningWidgets();	
-	mConversationsRoot->setRect(mConversationsListPanel->getLocalRect());
-	mConversationsRoot->setFollowsAll();
-	
 	if (mTabContainer->getTabCount() == 0)
 	{
 		// Do not close the container when every conversation is torn off because the user

indra/newview/llimfloatercontainer.h

@@ -71,8 +71,6 @@ public:
 
 	static LLIMFloaterContainer* getInstance();
 
-	static void idle(void* user_data);
-
 	virtual void setMinimized(BOOL b);
 
 	void collapseMessagesPane(bool collapse);