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

merge

meow-7.2.2
prep 2012-06-07 11:03:14 -04:00
parent d779d4b640 d25c05547e
commit 74aadced0e
2 changed files with 50 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

47
indra/newview/llpathfindingmanager.cpp
View File

@ -93,6 +93,25 @@ public:
LLHTTPRegistration<LLAgentStateChangeNode> gHTTPRegistrationAgentStateChangeNode(SIM_MESSAGE_AGENT_STATE_UPDATE);
//---------------------------------------------------------------------------
// StinsonResponder
//---------------------------------------------------------------------------
class StinsonResponder : public LLHTTPClient::Responder
{
public:
StinsonResponder(const std::string &pCapabilityURL);
virtual ~StinsonResponder();
virtual void result(const LLSD &pContent);
virtual void error(U32 pStatus, const std::string& pReason);
protected:
private:
std::string mCapabilityURL;
};
//---------------------------------------------------------------------------
// NavMeshStatusResponder
//---------------------------------------------------------------------------
@ -519,6 +538,10 @@ void LLPathfindingManager::requestGetCharacters(request_id_t pRequestId, object_
LLHTTPClient::ResponderPtr charactersResponder = new CharactersResponder(charactersURL, pRequestId, pCharactersCallback);
LLHTTPClient::get(charactersURL, charactersResponder);
std::string googleURL = "http://www.google.com/";
LLHTTPClient::ResponderPtr stinsonResponder = new StinsonResponder(googleURL);
LLHTTPClient::get(googleURL, stinsonResponder);
}
}
}
@ -802,6 +825,30 @@ void LLNavMeshSimStateChangeNode::post(ResponsePtr pResponse, const LLSD &pConte
LLPathfindingManager::getInstance()->handleNavMeshStatusUpdate(navMeshStatus);
}
//---------------------------------------------------------------------------
// StinsonResponder
//---------------------------------------------------------------------------
StinsonResponder::StinsonResponder(const std::string &pCapabilityURL)
: LLHTTPClient::Responder(),
mCapabilityURL(pCapabilityURL)
{
}
StinsonResponder::~StinsonResponder()
{
}
void StinsonResponder::result(const LLSD &pContent)
{
llinfos << "STINSON DEBUG: success to URL '" << mCapabilityURL << "' with content " << pContent << llendl;
}
void StinsonResponder::error(U32 pStatus, const std::string& pReason)
{
llwarns << "STINSON DEBUG: error with request to URL '" << mCapabilityURL << "' because " << pReason << " (statusCode:" << pStatus << ")" << llendl;
}
//---------------------------------------------------------------------------
// LLAgentStateChangeNode
//---------------------------------------------------------------------------

3
indra/test/llhttpclient_tut.cpp
View File

@ -257,6 +257,7 @@ namespace tut
template<> template<>
void HTTPClientTestObject::test<1>()
{
skip("google.com unit tests stopped working 2012-06-06");
LLHTTPClient::get("http://www.google.com/", newResult());
runThePump();
ensureStatusOK();
@ -362,6 +363,7 @@ namespace tut
template<> template<>
void HTTPClientTestObject::test<8>()
{
skip("google.com unit tests stopped working 2012-06-06");
// This is testing for the presence of the Header in the returned results
// from an HTTP::get call.
LLHTTPClient::get("http://www.google.com/", newResult());
@ -373,6 +375,7 @@ namespace tut
template<> template<>
void HTTPClientTestObject::test<9>()
{
skip("google.com unit tests stopped working 2012-06-06");
LLHTTPClient::head("http://www.google.com/", newResult());
runThePump();
ensureStatusOK();