merge r58577:58578 Branch_1-13-3 to release

2 files changed, 21 insertions, 0 deletions

diff --git a/indra/llcommon/lluri.cpp b/indra/llcommon/lluri.cpp
index 5ecba4420d..cf06fe3f40 100644
--- a/indra/llcommon/lluri.cpp
+++ b/indra/llcommon/lluri.cpp
@@ -467,6 +467,25 @@ LLURI LLURI::buildAgentSessionURI(const LLUUID& agent_id, LLApp* app)
 }
 
 // static
+LLURI LLURI::buildInventoryHostURI(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("inventory");
+	path.append("host");
+
+	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 b1ac0bca2b..514628237d 100644
--- a/indra/llcommon/lluri.h
+++ b/indra/llcommon/lluri.h
@@ -68,6 +68,8 @@ public:
 	static LLURI buildBulkAgentPresenceURI(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);
+	
 private:
 	std::string mScheme;
 	std::string mEscapedOpaque;