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

Fix LSL bridge responder and use new cURL API

Ansariel 2015-01-11 02:28:25 +01:00
parent a788c31354
commit 504921d80f
2 changed files with 9 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
indra/newview/fslslbridgerequest.cpp
View File

@ -42,9 +42,9 @@ FSLSLBridgeRequestResponder::~FSLSLBridgeRequestResponder()
}
//If we get back a normal response, handle it here
void FSLSLBridgeRequestResponder::result(const LLSD& content)
void FSLSLBridgeRequestResponder::httpSuccess()
{
std::string strContent = content.asString();
std::string strContent = getContent().asString();
LL_DEBUGS() << "Got info: " << strContent << LL_ENDL;
//do not use - infinite loop, only here for testing.
@ -52,9 +52,9 @@ void FSLSLBridgeRequestResponder::result(const LLSD& content)
}
//If we get back an error (not found, etc...), handle it here
void FSLSLBridgeRequestResponder::error(U32 status, const std::string& reason)
void FSLSLBridgeRequestResponder::httpFailure()
{
LL_WARNS() << "FSLSLBridgeRequest::error(" << status << ": " << reason << ")" << LL_ENDL;
LL_WARNS() << "FSLSLBridgeRequest::error(" << getStatus() << ": " << getReason() << ")" << LL_ENDL;
}
// AO: The below handler is used to parse return data from the bridge, requesting bulk ZOffset updates.
@ -66,12 +66,12 @@ FSLSLBridgeRequestRadarPosResponder::~FSLSLBridgeRequestRadarPosResponder()
{
}
void FSLSLBridgeRequestRadarPosResponder::result(const LLSD& content)
void FSLSLBridgeRequestRadarPosResponder::httpSuccess()
{
FSRadar* radar = FSRadar::getInstance();
if (radar)
{
std::string strContent = content.asString();
std::string strContent = getContent().asString();
//LL_INFOS() << "Got info: " << strContent << LL_ENDL;
// AO: parse content into pairs of [agent UUID,agent zHeight] , update our peoplepanel radar for each one

6
indra/newview/fslslbridgerequest.h
View File

@ -40,9 +40,9 @@ public:
FSLSLBridgeRequestResponder();
virtual ~FSLSLBridgeRequestResponder();
//If we get back a normal response, handle it here
virtual void result(const LLSD& content);
virtual void httpSuccess();
//If we get back an error (not found, etc...), handle it here
virtual void error(U32 status, const std::string& reason);
virtual void httpFailure();
};
@ -56,7 +56,7 @@ public:
FSLSLBridgeRequestRadarPosResponder();
virtual ~FSLSLBridgeRequestRadarPosResponder();
//If we get back a normal response, handle it here
void result(const LLSD& content);
void httpSuccess();
};
#endif // FS_LSLBRIDGEREQUEST_H