aboutsummaryrefslogtreecommitdiffstatshomepage
diff options
context:
space:
mode:
authorlbsa712009-03-10 11:47:34 +0000
committerlbsa712009-03-10 11:47:34 +0000
commit1917238cd3f24f05343a8b7737b8208c6e587700 (patch)
tree8fdb70063f291c5e8af4f695d8bd83504729b429
parent* Removed unused and uncommented file (diff)
downloadopensim-SC-1917238cd3f24f05343a8b7737b8208c6e587700.zip
opensim-SC-1917238cd3f24f05343a8b7737b8208c6e587700.tar.gz
opensim-SC-1917238cd3f24f05343a8b7737b8208c6e587700.tar.bz2
opensim-SC-1917238cd3f24f05343a8b7737b8208c6e587700.tar.xz
* Re-aligned CustomiseResponse function for imminent up-pulling
Diffstat (limited to '')
-rw-r--r--OpenSim/Client/Linden/LLStandaloneLoginService.cs30
-rw-r--r--OpenSim/Framework/Communications/LoginService.cs3
-rw-r--r--OpenSim/Grid/UserServer.Modules/UserLoginService.cs6
3 files changed, 21 insertions, 18 deletions
diff --git a/OpenSim/Client/Linden/LLStandaloneLoginService.cs b/OpenSim/Client/Linden/LLStandaloneLoginService.cs
index 5f43814..8fe7172 100644
--- a/OpenSim/Client/Linden/LLStandaloneLoginService.cs
+++ b/OpenSim/Client/Linden/LLStandaloneLoginService.cs
@@ -48,10 +48,8 @@ namespace OpenSim.Client.Linden
48 { 48 {
49 private static readonly ILog m_log = LogManager.GetLogger(MethodBase.GetCurrentMethod().DeclaringType); 49 private static readonly ILog m_log = LogManager.GetLogger(MethodBase.GetCurrentMethod().DeclaringType);
50 50
51 protected NetworkServersInfo serversInfo; 51 protected NetworkServersInfo m_serversInfo;
52 protected uint defaultHomeX; 52 protected bool m_authUsers = false;
53 protected uint defaultHomeY;
54 protected bool authUsers = false;
55 53
56 /// <summary> 54 /// <summary>
57 /// Used by the login service to make requests to the inventory service. 55 /// Used by the login service to make requests to the inventory service.
@@ -71,10 +69,10 @@ namespace OpenSim.Client.Linden
71 bool authenticate, LibraryRootFolder libraryRootFolder, ILoginServiceToRegionsConnector regionsConnector) 69 bool authenticate, LibraryRootFolder libraryRootFolder, ILoginServiceToRegionsConnector regionsConnector)
72 : base(userManager, libraryRootFolder, welcomeMess) 70 : base(userManager, libraryRootFolder, welcomeMess)
73 { 71 {
74 this.serversInfo = serversInfo; 72 this.m_serversInfo = serversInfo;
75 defaultHomeX = this.serversInfo.DefaultHomeLocX; 73 m_defaultHomeX = this.m_serversInfo.DefaultHomeLocX;
76 defaultHomeY = this.serversInfo.DefaultHomeLocY; 74 m_defaultHomeY = this.m_serversInfo.DefaultHomeLocY;
77 authUsers = authenticate; 75 m_authUsers = authenticate;
78 76
79 m_interServiceInventoryService = interServiceInventoryService; 77 m_interServiceInventoryService = interServiceInventoryService;
80 m_regionsConnector = regionsConnector; 78 m_regionsConnector = regionsConnector;
@@ -88,12 +86,12 @@ namespace OpenSim.Client.Linden
88 return profile; 86 return profile;
89 } 87 }
90 88
91 if (!authUsers) 89 if (!m_authUsers)
92 { 90 {
93 //no current user account so make one 91 //no current user account so make one
94 m_log.Info("[LOGIN]: No user account found so creating a new one."); 92 m_log.Info("[LOGIN]: No user account found so creating a new one.");
95 93
96 m_userManager.AddUser(firstname, lastname, "test", "", defaultHomeX, defaultHomeY); 94 m_userManager.AddUser(firstname, lastname, "test", "", m_defaultHomeX, m_defaultHomeY);
97 95
98 return m_userManager.GetUserProfile(firstname, lastname); 96 return m_userManager.GetUserProfile(firstname, lastname);
99 } 97 }
@@ -103,7 +101,7 @@ namespace OpenSim.Client.Linden
103 101
104 public override bool AuthenticateUser(UserProfileData profile, string password) 102 public override bool AuthenticateUser(UserProfileData profile, string password)
105 { 103 {
106 if (!authUsers) 104 if (!m_authUsers)
107 { 105 {
108 //for now we will accept any password in sandbox mode 106 //for now we will accept any password in sandbox mode
109 m_log.Info("[LOGIN]: Authorising user (no actual password check)"); 107 m_log.Info("[LOGIN]: Authorising user (no actual password check)");
@@ -235,8 +233,8 @@ namespace OpenSim.Client.Linden
235 //m_log.InfoFormat("[LOGIN]: StartLocation not available sending to region {0}", regionInfo.regionName); 233 //m_log.InfoFormat("[LOGIN]: StartLocation not available sending to region {0}", regionInfo.regionName);
236 234
237 // Send him to default region instead 235 // Send him to default region instead
238 ulong defaultHandle = (((ulong)defaultHomeX * Constants.RegionSize) << 32) | 236 ulong defaultHandle = (((ulong)m_defaultHomeX * Constants.RegionSize) << 32) |
239 ((ulong)defaultHomeY * Constants.RegionSize); 237 ((ulong)m_defaultHomeY * Constants.RegionSize);
240 238
241 if ((regionInfo != null) && (defaultHandle == regionInfo.RegionHandle)) 239 if ((regionInfo != null) && (defaultHandle == regionInfo.RegionHandle))
242 { 240 {
@@ -328,13 +326,13 @@ namespace OpenSim.Client.Linden
328 326
329 string seedcap = "http://"; 327 string seedcap = "http://";
330 328
331 if (serversInfo.HttpUsesSSL) 329 if (m_serversInfo.HttpUsesSSL)
332 { 330 {
333 seedcap = "https://" + serversInfo.HttpSSLCN + ":" + serversInfo.httpSSLPort + capsSeedPath; 331 seedcap = "https://" + m_serversInfo.HttpSSLCN + ":" + m_serversInfo.httpSSLPort + capsSeedPath;
334 } 332 }
335 else 333 else
336 { 334 {
337 seedcap = "http://" + regionInfo.ExternalHostName + ":" + serversInfo.HttpListenerPort + capsSeedPath; 335 seedcap = "http://" + regionInfo.ExternalHostName + ":" + m_serversInfo.HttpListenerPort + capsSeedPath;
338 } 336 }
339 337
340 response.SeedCapability = seedcap; 338 response.SeedCapability = seedcap;
diff --git a/OpenSim/Framework/Communications/LoginService.cs b/OpenSim/Framework/Communications/LoginService.cs
index e8e0559..36d7280 100644
--- a/OpenSim/Framework/Communications/LoginService.cs
+++ b/OpenSim/Framework/Communications/LoginService.cs
@@ -56,6 +56,9 @@ namespace OpenSim.Framework.Communications
56 /// </summary> 56 /// </summary>
57 protected LibraryRootFolder m_libraryRootFolder; 57 protected LibraryRootFolder m_libraryRootFolder;
58 58
59 protected uint m_defaultHomeX;
60 protected uint m_defaultHomeY;
61
59 /// <summary> 62 /// <summary>
60 /// Constructor 63 /// Constructor
61 /// </summary> 64 /// </summary>
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 {