diff options
| author | Merov Linden <merov@lindenlab.com> | 2012-09-25 08:36:20 -0700 |
|---|---|---|
| committer | Merov Linden <merov@lindenlab.com> | 2012-09-25 08:36:20 -0700 |
| commit | 0fd91052a82c2a2598bcd9cad667285b700899b2 (patch) | |
| tree | db66165975ed36d6a8295e7df041aee24fb5b764 /indra/newview/llimconversation.cpp | |
| parent | 5b0e06108b3c4373c55103dedab3306f06d392c9 (diff) | |
| parent | b28cb6843cdfedbd059ae3961cb528339127fbfd (diff) | |
Merge pull from richard/viewer-chui
Diffstat (limited to 'indra/newview/llimconversation.cpp')
| -rw-r--r-- | indra/newview/llimconversation.cpp | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/indra/newview/llimconversation.cpp b/indra/newview/llimconversation.cpp index 64f171ce8f..2ad7f9b193 100644 --- a/indra/newview/llimconversation.cpp +++ b/indra/newview/llimconversation.cpp @@ -42,13 +42,13 @@ const F32 REFRESH_INTERVAL = 0.2f; -LLIMConversation::LLIMConversation(const LLUUID& session_id) +LLIMConversation::LLIMConversation(const LLSD& session_id) : LLTransientDockableFloater(NULL, true, session_id) , mIsP2PChat(false) , mExpandCollapseBtn(NULL) , mTearOffBtn(NULL) , mCloseBtn(NULL) - , mSessionID(session_id) + , mSessionID(session_id.asUUID()) , mParticipantList(NULL) , mChatHistory(NULL) , mInputEditor(NULL) @@ -424,6 +424,7 @@ void LLIMConversation::updateHeaderAndToolbar() mExpandCollapseBtn->setEnabled(!is_torn_off || !mIsP2PChat); mTearOffBtn->setImageOverlay(getString(is_torn_off? "return_icon" : "tear_off_icon")); + mTearOffBtn->setToolTip(getString(!is_torn_off? "tooltip_to_separate_window" : "tooltip_to_main_window")); mCloseBtn->setVisible(!is_torn_off && !mIsNearbyChat); |