diff options
| author | Josh Bell <josh@lindenlab.com> | 2007-01-08 21:43:30 +0000 |
|---|---|---|
| committer | Josh Bell <josh@lindenlab.com> | 2007-01-08 21:43:30 +0000 |
| commit | fbf49910f34278a39dffff7e6c8bc654839988fb (patch) | |
| tree | 627ae5b2818f671898b855d5ef8d02a9789d9432 /indra/newview/llimview.cpp | |
| parent | c618a55f769946369e3d80f71eeb3c42042ab4e0 (diff) | |
svn merge -r 56431:56560 svn+ssh://svn.lindenlab.com/svn/linden/branches/maintenance
Diffstat (limited to 'indra/newview/llimview.cpp')
| -rw-r--r-- | indra/newview/llimview.cpp | 6 |
1 files changed, 3 insertions, 3 deletions
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(); |