From 437882ca3ba259911d02889621afa334ae1c76db Mon Sep 17 00:00:00 2001 From: Kelly Washington Date: Mon, 5 Mar 2007 19:08:01 +0000 Subject: merge r58577:58578 Branch_1-13-3 to release --- indra/llcommon/lluri.cpp | 19 +++++++++++++++++++ indra/llcommon/lluri.h | 2 ++ 2 files changed, 21 insertions(+) (limited to 'indra/llcommon') 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 @@ -466,6 +466,25 @@ LLURI LLURI::buildAgentSessionURI(const LLUUID& agent_id, LLApp* app) return buildHTTP(host, path); } +// 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) { 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; -- cgit v1.2.3