diff options
Diffstat (limited to 'linden/indra/llcommon/lluri.cpp')
-rw-r--r-- | linden/indra/llcommon/lluri.cpp | 111 |
1 files changed, 0 insertions, 111 deletions
diff --git a/linden/indra/llcommon/lluri.cpp b/linden/indra/llcommon/lluri.cpp index 43d2147..892ac02 100644 --- a/linden/indra/llcommon/lluri.cpp +++ b/linden/indra/llcommon/lluri.cpp | |||
@@ -319,117 +319,6 @@ LLURI LLURI::buildHTTP(const std::string& host, | |||
319 | return LLURI::buildHTTP(llformat("%s:%u", host.c_str(), port), path, query); | 319 | return LLURI::buildHTTP(llformat("%s:%u", host.c_str(), port), path, query); |
320 | } | 320 | } |
321 | 321 | ||
322 | namespace { | ||
323 | LLURI buildBackboneURL(LLApp* app, | ||
324 | const std::string& p1 = "", | ||
325 | const std::string& p2 = "", | ||
326 | const std::string& p3 = "") | ||
327 | { | ||
328 | std::string host = "localhost:12040"; | ||
329 | |||
330 | if (app) | ||
331 | { | ||
332 | host = app->getOption("backbone-host-port").asString(); | ||
333 | } | ||
334 | |||
335 | LLSD path = LLSD::emptyArray(); | ||
336 | if (!p1.empty()) path.append(p1); | ||
337 | if (!p2.empty()) path.append(p2); | ||
338 | if (!p3.empty()) path.append(p3); | ||
339 | |||
340 | return LLURI::buildHTTP(host, path); | ||
341 | } | ||
342 | } | ||
343 | |||
344 | #if LL_ENABLE_JANKY_DEPRECATED_WEB_SERVICE_CALLS | ||
345 | // static | ||
346 | LLURI LLURI::buildBulkAgentNamesURI(LLApp* app) | ||
347 | { | ||
348 | std::string host = "localhost:12040"; | ||
349 | |||
350 | if (app) | ||
351 | { | ||
352 | host = app->getOption("backbone-host-port").asString(); | ||
353 | } | ||
354 | |||
355 | LLSD path = LLSD::emptyArray(); | ||
356 | path.append("agent"); | ||
357 | path.append("names"); | ||
358 | |||
359 | return buildHTTP(host, path); | ||
360 | } | ||
361 | |||
362 | // static | ||
363 | LLURI LLURI::buildBulkAgentNamesURI(LLApp* app) | ||
364 | { | ||
365 | std::string host = "localhost:12040"; | ||
366 | |||
367 | if (app) | ||
368 | { | ||
369 | host = app->getOption("backbone-host-port").asString(); | ||
370 | } | ||
371 | |||
372 | LLSD path = LLSD::emptyArray(); | ||
373 | path.append("agent"); | ||
374 | path.append("names"); | ||
375 | |||
376 | return buildHTTP(host, path); | ||
377 | } | ||
378 | |||
379 | // static | ||
380 | LLURI LLURI::buildAgentSessionURI(const LLUUID& agent_id, LLApp* app) | ||
381 | { | ||
382 | return buildBackboneURL(app, "agent", agent_id.asString(), "session"); | ||
383 | } | ||
384 | |||
385 | // static | ||
386 | LLURI LLURI::buildAgentNameURI(const LLUUID& agent_id, LLApp* app) | ||
387 | { | ||
388 | std::string host = "localhost:12040"; | ||
389 | |||
390 | if (app) | ||
391 | { | ||
392 | host = app->getOption("backbone-host-port").asString(); | ||
393 | } | ||
394 | |||
395 | LLSD path = LLSD::emptyArray(); | ||
396 | path.append("agent"); | ||
397 | path.append(agent_id); | ||
398 | path.append("name"); | ||
399 | |||
400 | return buildHTTP(host, path); | ||
401 | } | ||
402 | |||
403 | // static | ||
404 | LLURI LLURI::buildAgentNameURI(const LLUUID& agent_id, LLApp* app) | ||
405 | { | ||
406 | std::string host = "localhost:12040"; | ||
407 | |||
408 | if (app) | ||
409 | { | ||
410 | host = app->getOption("backbone-host-port").asString(); | ||
411 | } | ||
412 | |||
413 | LLSD path = LLSD::emptyArray(); | ||
414 | path.append("agent"); | ||
415 | path.append(agent_id); | ||
416 | path.append("name"); | ||
417 | |||
418 | return buildHTTP(host, path); | ||
419 | } | ||
420 | |||
421 | // static | ||
422 | LLURI LLURI::buildAgentLoginInfoURI(const LLUUID& agent_id, const std::string& dataserver) | ||
423 | { | ||
424 | LLSD path = LLSD::emptyArray(); | ||
425 | path.append("agent"); | ||
426 | path.append(agent_id); | ||
427 | path.append("logininfo"); | ||
428 | |||
429 | return buildHTTP(dataserver, path); | ||
430 | } | ||
431 | #endif // LL_ENABLE_JANKY_DEPRECATED_WEB_SERVICE_CALLS | ||
432 | |||
433 | std::string LLURI::asString() const | 322 | std::string LLURI::asString() const |
434 | { | 323 | { |
435 | if (mScheme.empty()) | 324 | if (mScheme.empty()) |