livie
/
phoenix-firestorm
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Floater IM Session to trivial coroutine. 

Changed debugging output from core utitl to string.
master
Rider Linden 2015-05-22 10:59:43 -07:00
parent ff121254b2
commit f7fa3b5f56
2 changed files with 8 additions and 24 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
indra/llmessage/llcorehttputil.cpp
View File

@ -264,11 +264,13 @@ void HttpCoroHandler::onCompleted(LLCore::HttpHandle handle, LLCore::HttpRespons
LLCore::BufferArray *body = response->getBody();
LLCore::BufferArrayStream bas(body);
LLSD::Binary bodyData;
LLSD::String bodyData;
bodyData.reserve(response->getBodySize());
bas >> std::noskipws;
bodyData.assign(std::istream_iterator<U8>(bas), std::istream_iterator<U8>());
httpStatus["error_body"] = bodyData;
httpStatus["error_body"] = LLSD(bodyData);
LL_WARNS() << "Returned body=" << std::endl << httpStatus["error_body"].asString() << LL_ENDL;
}
#endif

26
indra/newview/llfloaterimsession.cpp
View File

@ -41,7 +41,6 @@
#include "llchicletbar.h"
#include "lldonotdisturbnotificationstorage.h"
#include "llfloaterreg.h"
#include "llhttpclient.h"
#include "llfloateravatarpicker.h"
#include "llfloaterimcontainer.h" // to replace separate IM Floaters with multifloater container
#include "llinventoryfunctions.h"
@ -62,6 +61,7 @@
#include "llviewerchat.h"
#include "llnotificationmanager.h"
#include "llautoreplace.h"
#include "llcorehttputil.h"
const F32 ME_TYPING_TIMEOUT = 4.0f;
const F32 OTHER_TYPING_TIMEOUT = 9.0f;
@ -1178,26 +1178,6 @@ BOOL LLFloaterIMSession::isInviteAllowed() const
|| mIsP2PChat);
}
class LLSessionInviteResponder : public LLHTTPClient::Responder
{
LOG_CLASS(LLSessionInviteResponder);
public:
LLSessionInviteResponder(const LLUUID& session_id)
{
mSessionID = session_id;
}
protected:
void httpFailure()
{
LL_WARNS() << "Error inviting all agents to session " << dumpResponse() << LL_ENDL;
//throw something back to the viewer here?
}
private:
LLUUID mSessionID;
};
BOOL LLFloaterIMSession::inviteToSession(const uuid_vec_t& ids)
{
LLViewerRegion* region = gAgent.getRegion();
@ -1221,7 +1201,9 @@ BOOL LLFloaterIMSession::inviteToSession(const uuid_vec_t& ids)
}
data["method"] = "invite";
data["session-id"] = mSessionID;
LLHTTPClient::post(url, data,new LLSessionInviteResponder(mSessionID));
LLCoreHttpUtil::HttpCoroutineAdapter::messageHttpPost(url, data,
"Session invite sent", "Session invite failed");
}
else
{