diff options
author | dolphin <dolphin@lindenlab.com> | 2013-06-19 09:58:43 -0700 |
---|---|---|
committer | dolphin <dolphin@lindenlab.com> | 2013-06-19 09:58:43 -0700 |
commit | ea40b3a37b0f9b7e09e999a2c6529905e251ecad (patch) | |
tree | 9cfb5603040efc7738bca633b902c190db28b0bf /indra/newview/llimview.cpp | |
parent | ebc604fa8d12fb08fda1ac55aae817ad0135bb6b (diff) | |
parent | 2655c7a17ae38a073dcf8f05b0127b68edc34c95 (diff) |
Merge with viewer 3.6.0
Diffstat (limited to 'indra/newview/llimview.cpp')
-rwxr-xr-x | indra/newview/llimview.cpp | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/indra/newview/llimview.cpp b/indra/newview/llimview.cpp index 2c20409381..3b72ad3cd9 100755 --- a/indra/newview/llimview.cpp +++ b/indra/newview/llimview.cpp @@ -228,7 +228,7 @@ void on_new_message(const LLSD& msg) // 0. nothing - exit if (("none" == user_preferences || ON_TOP_AND_ITEM_IS_SELECTED == conversations_floater_status) - && session_floater->isMessagePaneExpanded()) + && session_floater->isMessagePaneExpanded()) { return; } @@ -1561,7 +1561,7 @@ public: } void errorWithContent(U32 statusNum, const std::string& reason, const LLSD& content) - { + { llwarns << "LLViewerChatterBoxInvitationAcceptResponder error [status:" << statusNum << "]: " << content << llendl; //throw something back to the viewer here? |