From fbf49910f34278a39dffff7e6c8bc654839988fb Mon Sep 17 00:00:00 2001
From: Josh Bell <josh@lindenlab.com>
Date: Mon, 8 Jan 2007 21:43:30 +0000
Subject: svn merge -r 56431:56560
 svn+ssh://svn.lindenlab.com/svn/linden/branches/maintenance

---
 indra/newview/llimview.cpp | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

(limited to 'indra/newview/llimview.cpp')

diff --git a/indra/newview/llimview.cpp b/indra/newview/llimview.cpp
index fb8438dc93..f333f7bb6c 100644
--- a/indra/newview/llimview.cpp
+++ b/indra/newview/llimview.cpp
@@ -55,7 +55,7 @@ static LLString sOfflineMessage;
 //
 
 // returns true if a should appear before b
-BOOL group_dictionary_sort( LLGroupData* a, LLGroupData* b )
+static BOOL group_dictionary_sort( LLGroupData* a, LLGroupData* b )
 {
 	return (LLString::compareDict( a->mName, b->mName ) < 0);
 }
@@ -63,7 +63,7 @@ BOOL group_dictionary_sort( LLGroupData* a, LLGroupData* b )
 
 // the other_participant_id is either an agent_id, a group_id, or an inventory
 // folder item_id (collection of calling cards)
-LLUUID compute_session_id(EInstantMessage dialog, const LLUUID& other_participant_id)
+static LLUUID compute_session_id(EInstantMessage dialog, const LLUUID& other_participant_id)
 {
 	LLUUID session_id;
 	if (IM_SESSION_GROUP_START == dialog)
@@ -95,6 +95,7 @@ LLUUID compute_session_id(EInstantMessage dialog, const LLUUID& other_participan
 
 LLFloaterIM::LLFloaterIM() 
 {
+	gUICtrlFactory->buildFloater(this, "floater_im.xml");
 }
 
 BOOL LLFloaterIM::postBuild()
@@ -266,7 +267,6 @@ LLIMView::LLIMView(const std::string& name, const LLRect& rect) :
 	LLAvatarTracker::instance().addObserver(mFriendObserver);
 
 	mTalkFloater = new LLFloaterIM();
-	gUICtrlFactory->buildFloater(mTalkFloater, "floater_im.xml");
 
 	// New IM Panel
 	mNewIMFloater = new LLFloaterNewIM();
-- 
cgit v1.2.3