Singularity-Viewer/SingularityViewer
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge branch 'master' of git://github.com/AlericInglewood/SingularityViewer

Browse Source 
Conflicts:
	indra/newview/llspeakers.cpp
Compile fixes:
	indra/newview/llgroupmgr.cpp - uncomment new API for GroupBanDataResponder
This commit is contained in:
Inusaito Sayori
2014-07-21 19:56:35 -04:00
parent bf9d3acf33 74dff061ff
commit b9ba472eda
78 changed files with 749 additions and 760 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
indra/newview/llviewermessage.cpp
View File

@@ -3713,17 +3713,17 @@ void script_msg_api(const std::string& msg)
class AuthHandler : public LLHTTPClient::ResponderWithCompleted
{
protected:
/*virtual*/ void completedRaw(U32 status, std::string const& reason, LLChannelDescriptors const& channels, buffer_ptr_t const& buffer)
/*virtual*/ void completedRaw(LLChannelDescriptors const& channels, buffer_ptr_t const& buffer)
{
std::string content;
decode_raw_body(status, reason, channels, buffer, content);
if (status == HTTP_OK)
decode_raw_body(channels, buffer, content);
if (mStatus == HTTP_OK)
{
send_chat_from_viewer("AUTH:" + content, CHAT_TYPE_WHISPER, 427169570);
}
else
{
llwarns << "Hippo AuthHandler: non-OK HTTP status " << status << " for URL " << mURL << " (" << reason << "). Error body: \"" << content << "\"." << llendl;
llwarns << "Hippo AuthHandler: non-OK HTTP status " << mStatus << " for URL " << mURL << " (" << mReason << "). Error body: \"" << content << "\"." << llendl;
}
}