aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Grid
diff options
context:
space:
mode:
authorJustin Clarke Casey2008-07-24 17:19:33 +0000
committerJustin Clarke Casey2008-07-24 17:19:33 +0000
commitcdd353770691cb3c6bfcb452fc0fe2c2dffa454e (patch)
treea7f66d88525b51550dc59ee7ee1acac922f4132e /OpenSim/Grid
parent* refactor: move remaining user service -> inventory service OGS1 calls into ... (diff)
downloadopensim-SC_OLD-cdd353770691cb3c6bfcb452fc0fe2c2dffa454e.zip
opensim-SC_OLD-cdd353770691cb3c6bfcb452fc0fe2c2dffa454e.tar.gz
opensim-SC_OLD-cdd353770691cb3c6bfcb452fc0fe2c2dffa454e.tar.bz2
opensim-SC_OLD-cdd353770691cb3c6bfcb452fc0fe2c2dffa454e.tar.xz
* refactor: Remove now redundant inventory server url being passed to GetInventorySkeleton
Diffstat (limited to 'OpenSim/Grid')
-rw-r--r--OpenSim/Grid/UserServer/UserLoginService.cs9
1 files changed, 2 insertions, 7 deletions
diff --git a/OpenSim/Grid/UserServer/UserLoginService.cs b/OpenSim/Grid/UserServer/UserLoginService.cs
index 6575b13..59af373 100644
--- a/OpenSim/Grid/UserServer/UserLoginService.cs
+++ b/OpenSim/Grid/UserServer/UserLoginService.cs
@@ -402,17 +402,12 @@ namespace OpenSim.Grid.UserServer
402 else 402 else
403 { 403 {
404 response.CreateDeadRegionResponse(); 404 response.CreateDeadRegionResponse();
405
406 } 405 }
407
408
409 } 406 }
410 else 407 else
411 { 408 {
412 response.CreateDeadRegionResponse(); 409 response.CreateDeadRegionResponse();
413 410 }
414 }
415
416 } 411 }
417 412
418 catch (Exception e) 413 catch (Exception e)
@@ -424,7 +419,7 @@ namespace OpenSim.Grid.UserServer
424 } 419 }
425 420
426 // See LoginService 421 // See LoginService
427 protected override InventoryData GetInventorySkeleton(LLUUID userID, string serverUrl) 422 protected override InventoryData GetInventorySkeleton(LLUUID userID)
428 { 423 {
429 m_log.DebugFormat( 424 m_log.DebugFormat(
430 "[LOGIN]: Contacting inventory service at {0} for inventory skeleton of user {1}", 425 "[LOGIN]: Contacting inventory service at {0} for inventory skeleton of user {1}",