summaryrefslogtreecommitdiff
path: root/indra/newview/llgroupmgr.cpp
diff options
context:
space:
mode:
authorOz Linden <oz@lindenlab.com>2013-05-20 09:08:20 -0400
committerOz Linden <oz@lindenlab.com>2013-05-20 09:08:20 -0400
commit72e7269da376d660385f3c66ac2a25a5e50871ea (patch)
tree047bd9d1bf99fa8c308c379dd57758050aa5ef51 /indra/newview/llgroupmgr.cpp
parent621085d553cccc4238d74886ca44bcefafddd7f1 (diff)
parent0ebcb7e3fd1452d42b5ca48139f99a4fd632d235 (diff)
merge changes for 3.5.2-release
Diffstat (limited to 'indra/newview/llgroupmgr.cpp')
-rwxr-xr-x[-rw-r--r--]indra/newview/llgroupmgr.cpp7
1 files changed, 4 insertions, 3 deletions
diff --git a/indra/newview/llgroupmgr.cpp b/indra/newview/llgroupmgr.cpp
index 81eb1d397e..cbd844cdac 100644..100755
--- a/indra/newview/llgroupmgr.cpp
+++ b/indra/newview/llgroupmgr.cpp
@@ -1847,14 +1847,15 @@ public:
GroupMemberDataResponder() {}
virtual ~GroupMemberDataResponder() {}
virtual void result(const LLSD& pContent);
- virtual void error(U32 pStatus, const std::string& pReason);
+ virtual void errorWithContent(U32 pStatus, const std::string& pReason, const LLSD& pContent);
private:
LLSD mMemberData;
};
-void GroupMemberDataResponder::error(U32 pStatus, const std::string& pReason)
+void GroupMemberDataResponder::errorWithContent(U32 pStatus, const std::string& pReason, const LLSD& pContent)
{
- LL_WARNS("GrpMgr") << "Error receiving group member data." << LL_ENDL;
+ LL_WARNS("GrpMgr") << "Error receiving group member data [status:"
+ << pStatus << "]: " << pContent << LL_ENDL;
}
void GroupMemberDataResponder::result(const LLSD& content)