aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Grid
diff options
context:
space:
mode:
authorlbsa712009-03-10 11:47:34 +0000
committerlbsa712009-03-10 11:47:34 +0000
commit1917238cd3f24f05343a8b7737b8208c6e587700 (patch)
tree8fdb70063f291c5e8af4f695d8bd83504729b429 /OpenSim/Grid
parent* Removed unused and uncommented file (diff)
downloadopensim-SC_OLD-1917238cd3f24f05343a8b7737b8208c6e587700.zip
opensim-SC_OLD-1917238cd3f24f05343a8b7737b8208c6e587700.tar.gz
opensim-SC_OLD-1917238cd3f24f05343a8b7737b8208c6e587700.tar.bz2
opensim-SC_OLD-1917238cd3f24f05343a8b7737b8208c6e587700.tar.xz
* Re-aligned CustomiseResponse function for imminent up-pulling
Diffstat (limited to 'OpenSim/Grid')
-rw-r--r--OpenSim/Grid/UserServer.Modules/UserLoginService.cs6
1 files changed, 4 insertions, 2 deletions
diff --git a/OpenSim/Grid/UserServer.Modules/UserLoginService.cs b/OpenSim/Grid/UserServer.Modules/UserLoginService.cs
index 95e58a8..4e672f6 100644
--- a/OpenSim/Grid/UserServer.Modules/UserLoginService.cs
+++ b/OpenSim/Grid/UserServer.Modules/UserLoginService.cs
@@ -71,6 +71,8 @@ namespace OpenSim.Grid.UserServer.Modules
71 : base(userManager, libraryRootFolder, welcomeMess) 71 : base(userManager, libraryRootFolder, welcomeMess)
72 { 72 {
73 m_config = config; 73 m_config = config;
74 m_defaultHomeX = m_config.DefaultX;
75 m_defaultHomeY = m_config.DefaultY;
74 m_inventoryService = inventoryService; 76 m_inventoryService = inventoryService;
75 m_regionProfileService = regionProfileService; 77 m_regionProfileService = regionProfileService;
76 } 78 }
@@ -302,8 +304,8 @@ namespace OpenSim.Grid.UserServer.Modules
302 304
303 // Send him to default region instead 305 // Send him to default region instead
304 // Load information from the gridserver 306 // Load information from the gridserver
305 ulong defaultHandle = (((ulong) m_config.DefaultX * Constants.RegionSize) << 32) | 307 ulong defaultHandle = (((ulong) m_defaultHomeX * Constants.RegionSize) << 32) |
306 ((ulong) m_config.DefaultY * Constants.RegionSize); 308 ((ulong) m_defaultHomeY * Constants.RegionSize);
307 309
308 if ((regionInfo != null) && (defaultHandle == regionInfo.regionHandle)) 310 if ((regionInfo != null) && (defaultHandle == regionInfo.regionHandle))
309 { 311 {