diff options
author | Nyx Linden <nyx@lindenlab.com> | 2013-03-06 17:21:21 -0500 |
---|---|---|
committer | Nyx Linden <nyx@lindenlab.com> | 2013-03-06 17:21:21 -0500 |
commit | 25255ee13efdc3e8090412f7fce6bb7723277053 (patch) | |
tree | f77c6eb77e3cbcfcf72d1b5998a1275fac002d4c /indra/newview/llimfloater.cpp | |
parent | 2784a515b0e725f74bf0e5fab47153ba358b26d6 (diff) | |
parent | fe042430b03667abcd6b72ef9cc27d82d85f4242 (diff) |
merge
Diffstat (limited to 'indra/newview/llimfloater.cpp')
-rw-r--r-- | indra/newview/llimfloater.cpp | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/indra/newview/llimfloater.cpp b/indra/newview/llimfloater.cpp index 63eedcdfea..fff178f8fe 100644 --- a/indra/newview/llimfloater.cpp +++ b/indra/newview/llimfloater.cpp @@ -985,9 +985,10 @@ public: mSessionID = session_id; } - void error(U32 statusNum, const std::string& reason) + void errorWithContent(U32 statusNum, const std::string& reason, const LLSD& content) { - llinfos << "Error inviting all agents to session" << llendl; + llwarns << "Error inviting all agents to session [status:" + << statusNum << "]: " << content << llendl; //throw something back to the viewer here? } |