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

merge -r58842:59035 branches/loadstone-names to release

master
Kelly Washington 2007-03-16 17:29:45 +00:00
parent 9d3309f684
commit 1ada34fc0c
3 changed files with 53 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

35
indra/llcommon/lluri.cpp
View File

@ -278,6 +278,23 @@ LLURI LLURI::buildBulkAgentPresenceURI(LLApp* app)
return buildBackboneURL(app, "agent", "presence");
}
// static
LLURI LLURI::buildBulkAgentNamesURI(LLApp* app)
{
std::string host = "localhost:12040";
if (app)
{
host = app->getOption("backbone-host-port").asString();
}
LLSD path = LLSD::emptyArray();
path.append("agent");
path.append("names");
return buildHTTP(host, path);
}
// static
LLURI LLURI::buildAgentSessionURI(const LLUUID& agent_id, LLApp* app)
{
@ -303,6 +320,24 @@ LLURI LLURI::buildInventoryHostURI(const LLUUID& agent_id, LLApp* app)
return buildHTTP(host, path);
}
// static
LLURI LLURI::buildAgentNameURI(const LLUUID& agent_id, LLApp* app)
{
std::string host = "localhost:12040";
if (app)
{
host = app->getOption("backbone-host-port").asString();
}
LLSD path = LLSD::emptyArray();
path.append("agent");
path.append(agent_id);
path.append("name");
return buildHTTP(host, path);
}
// static
LLURI LLURI::buildAgentLoginInfoURI(const LLUUID& agent_id, const std::string& dataserver)
{

3
indra/llcommon/lluri.h
View File

@ -79,10 +79,11 @@ public:
// Functions for building specific URIs for web services
static LLURI buildAgentPresenceURI(const LLUUID& agent_id, LLApp* app);
static LLURI buildBulkAgentPresenceURI(LLApp* app);
static LLURI buildBulkAgentNamesURI(LLApp* app);
static LLURI buildAgentSessionURI(const LLUUID& agent_id, LLApp* app);
static LLURI buildAgentLoginInfoURI(const LLUUID& agent_id, const std::string& dataserver);
static LLURI buildInventoryHostURI(const LLUUID& agent_id, LLApp* app);
static LLURI buildAgentNameURI(const LLUUID& agent_id, LLApp* app);
private:
std::string mScheme;
std::string mEscapedOpaque;

20
indra/llmessage/llhttpclient.cpp
View File

@ -265,11 +265,19 @@ public:
LLSD asLLSD()
{
LLSD content;
if (mBuffer.empty()) return content;
std::istringstream istr(mBuffer);
LLSDSerialize::fromXML(content, istr);
return content;
}
std::string asString()
{
return mBuffer;
}
private:
std::string mBuffer;
};
@ -298,15 +306,20 @@ LLSD LLHTTPClient::blockingGet(const std::string& url)
S32 http_status = 499;
curl_easy_getinfo(curlp,CURLINFO_RESPONSE_CODE, &http_status);
response["status"] = http_status;
if (curl_success != 0
&& http_status != 404) // We expect 404s, don't spam for them.
{
llwarns << "CURL ERROR: " << curl_error_buffer << llendl;
response["body"] = http_buffer.asString();
}
else
{
response["body"] = http_buffer.asLLSD();
}
response["status"] = http_status;
response["body"] = http_buffer.asLLSD();
curl_easy_cleanup(curlp);
return response;
@ -375,4 +388,3 @@ namespace boost
}
}
};