diff options
| author | Cinder Roxley <cinder.roxley@phoenixviewer.com> | 2013-06-27 21:22:44 -0600 |
|---|---|---|
| committer | Cinder Roxley <cinder.roxley@phoenixviewer.com> | 2013-06-27 21:22:44 -0600 |
| commit | 7e0bc07e5cd72cfb7c55c964a73d9d8c9e9e5988 (patch) | |
| tree | e847d23a8642323ef63df22a9426f1524d4da796 /indra/newview/llimview.cpp | |
| parent | 4f7b8a7e861ee25f1e0f7b0df2e9c8372254f46d (diff) | |
| parent | 6060e5e46acbeb20a301070a0fd0efea029d33d0 (diff) | |
Merged lindenlab/viewer-release into default
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? |