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

2 files changed, 37 insertions, 1 deletions

diff --git a/indra/llcommon/lluri.cpp b/indra/llcommon/lluri.cpp
index a2c651b444..bf0d2cb21e 100644
--- a/indra/llcommon/lluri.cpp
+++ b/indra/llcommon/lluri.cpp
@@ -279,6 +279,23 @@ LLURI LLURI::buildBulkAgentPresenceURI(LLApp* app)
 }
 
 // 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)
 {
 	return buildBackboneURL(app, "agent", agent_id.asString(), "session");
@@ -304,6 +321,24 @@ LLURI LLURI::buildInventoryHostURI(const LLUUID& agent_id, LLApp* app)
 }
 
 // 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)
 {
 	LLSD path = LLSD::emptyArray();
diff --git a/indra/llcommon/lluri.h b/indra/llcommon/lluri.h
index b5c3a84173..865a3b21a0 100644
--- a/indra/llcommon/lluri.h
+++ b/indra/llcommon/lluri.h
@@ -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;