aboutsummaryrefslogtreecommitdiffstatshomepage
diff options
context:
space:
mode:
Diffstat (limited to '')
-rw-r--r--OpenSim/Framework/Communications/LoginService.cs12
-rw-r--r--OpenSim/Grid/UserServer/UserLoginService.cs1
-rw-r--r--OpenSim/Region/Communications/Local/LocalLoginService.cs6
-rw-r--r--OpenSim/Region/Environment/Scenes/Scene.cs1
-rw-r--r--OpenSim/Tests/Common/Mock/TestCommunicationsManager.cs9
5 files changed, 17 insertions, 12 deletions
diff --git a/OpenSim/Framework/Communications/LoginService.cs b/OpenSim/Framework/Communications/LoginService.cs
index 3f53c2f..b2434c2 100644
--- a/OpenSim/Framework/Communications/LoginService.cs
+++ b/OpenSim/Framework/Communications/LoginService.cs
@@ -160,7 +160,7 @@ namespace OpenSim.Framework.Communications
160 else 160 else
161 { 161 {
162 m_log.Info( 162 m_log.Info(
163 "[LOGIN END]: XMLRPC login_to_simulator login message did not contain all the required data"); 163 "[LOGIN END]: XMLRPC login_to_simulator login message did not contain all the required data");
164 164
165 return logResponse.CreateGridErrorResponse(); 165 return logResponse.CreateGridErrorResponse();
166 } 166 }
@@ -259,25 +259,25 @@ namespace OpenSim.Framework.Communications
259 StatsManager.UserStats.AddSuccessfulLogin(); 259 StatsManager.UserStats.AddSuccessfulLogin();
260 260
261 m_log.DebugFormat( 261 m_log.DebugFormat(
262 "[LOGIN END]: XMLRPC Authentication of user {0} {1} successful. Sending response to client.", 262 "[LOGIN END]: XMLRPC Authentication of user {0} {1} successful. Sending response to client.",
263 firstname, lastname); 263 firstname, lastname);
264 264
265 return logResponse.ToXmlRpcResponse(); 265 return logResponse.ToXmlRpcResponse();
266 } 266 }
267 else 267 else
268 { 268 {
269 m_log.ErrorFormat("[LOGIN END]: XMLRPC informing user {0} {1} that login failed due to an unavailable region", firstname, lastname); 269 m_log.ErrorFormat("[LOGIN END]: XMLRPC informing user {0} {1} that login failed due to an unavailable region", firstname, lastname);
270 return logResponse.CreateDeadRegionResponse(); 270 return logResponse.CreateDeadRegionResponse();
271 } 271 }
272 } 272 }
273 catch (Exception e) 273 catch (Exception e)
274 { 274 {
275 m_log.Error("[LOGIN END]: XMLRPC Login failed, " + e); 275 m_log.Error("[LOGIN END]: XMLRPC Login failed, " + e);
276 m_log.Error(e.StackTrace); 276 m_log.Error(e.StackTrace);
277 } 277 }
278 } 278 }
279 279
280 m_log.Info("[LOGIN END]: XMLRPC Login failed. Sending back blank XMLRPC response"); 280 m_log.Info("[LOGIN END]: XMLRPC Login failed. Sending back blank XMLRPC response");
281 return response; 281 return response;
282 } 282 }
283 finally 283 finally
@@ -329,7 +329,7 @@ namespace OpenSim.Framework.Communications
329 userProfile = GetTheUser(firstname, lastname); 329 userProfile = GetTheUser(firstname, lastname);
330 if (userProfile == null) 330 if (userProfile == null)
331 { 331 {
332 m_log.Info("[LOGIN]: LLSD Could not find a profile for " + firstname + " " + lastname); 332 m_log.Info("[LOGIN]: LLSD Could not find a profile for " + firstname + " " + lastname);
333 333
334 return false; 334 return false;
335 } 335 }
diff --git a/OpenSim/Grid/UserServer/UserLoginService.cs b/OpenSim/Grid/UserServer/UserLoginService.cs
index de0099f..1ba817d 100644
--- a/OpenSim/Grid/UserServer/UserLoginService.cs
+++ b/OpenSim/Grid/UserServer/UserLoginService.cs
@@ -316,6 +316,7 @@ namespace OpenSim.Grid.UserServer
316 m_log.InfoFormat( 316 m_log.InfoFormat(
317 "[LOGIN]: Telling {0} @ {1},{2} ({3}) to prepare for client connection", 317 "[LOGIN]: Telling {0} @ {1},{2} ({3}) to prepare for client connection",
318 regionInfo.regionName, response.RegionX, response.RegionY, regionInfo.httpServerURI); 318 regionInfo.regionName, response.RegionX, response.RegionY, regionInfo.httpServerURI);
319
319 // Update agent with target sim 320 // Update agent with target sim
320 user.CurrentAgent.Region = regionInfo.UUID; 321 user.CurrentAgent.Region = regionInfo.UUID;
321 user.CurrentAgent.Handle = regionInfo.regionHandle; 322 user.CurrentAgent.Handle = regionInfo.regionHandle;
diff --git a/OpenSim/Region/Communications/Local/LocalLoginService.cs b/OpenSim/Region/Communications/Local/LocalLoginService.cs
index e139501..8aa88f7 100644
--- a/OpenSim/Region/Communications/Local/LocalLoginService.cs
+++ b/OpenSim/Region/Communications/Local/LocalLoginService.cs
@@ -219,7 +219,7 @@ namespace OpenSim.Region.Communications.Local
219 219
220 if ((regionInfo != null) && (PrepareLoginToRegion(regionInfo, theUser, response))) 220 if ((regionInfo != null) && (PrepareLoginToRegion(regionInfo, theUser, response)))
221 { 221 {
222 return true; 222 return true;
223 } 223 }
224 224
225 // StartLocation not available, send him to a nearby region instead 225 // StartLocation not available, send him to a nearby region instead
@@ -303,11 +303,9 @@ namespace OpenSim.Region.Communications.Local
303 303
304 string seedcap = "http://"; 304 string seedcap = "http://";
305 305
306
307 if (serversInfo.HttpUsesSSL) 306 if (serversInfo.HttpUsesSSL)
308 { 307 {
309 seedcap = "https://" + serversInfo.HttpSSLCN + ":" + serversInfo.httpSSLPort + "/CAPS/" + capsPath + "0000/"; 308 seedcap = "https://" + serversInfo.HttpSSLCN + ":" + serversInfo.httpSSLPort + "/CAPS/" + capsPath + "0000/";
310
311 } 309 }
312 else 310 else
313 { 311 {
@@ -320,9 +318,11 @@ namespace OpenSim.Region.Communications.Local
320 m_log.InfoFormat( 318 m_log.InfoFormat(
321 "[LOGIN]: Telling {0} @ {1},{2} ({3}) to prepare for client connection", 319 "[LOGIN]: Telling {0} @ {1},{2} ({3}) to prepare for client connection",
322 regionInfo.RegionName, response.RegionX, response.RegionY, regionInfo.ServerURI); 320 regionInfo.RegionName, response.RegionX, response.RegionY, regionInfo.ServerURI);
321
323 // Update agent with target sim 322 // Update agent with target sim
324 user.CurrentAgent.Region = regionInfo.RegionID; 323 user.CurrentAgent.Region = regionInfo.RegionID;
325 user.CurrentAgent.Handle = regionInfo.RegionHandle; 324 user.CurrentAgent.Handle = regionInfo.RegionHandle;
325
326 // Prepare notification 326 // Prepare notification
327 Login loginParams = new Login(); 327 Login loginParams = new Login();
328 loginParams.Session = user.CurrentAgent.SessionID; 328 loginParams.Session = user.CurrentAgent.SessionID;
diff --git a/OpenSim/Region/Environment/Scenes/Scene.cs b/OpenSim/Region/Environment/Scenes/Scene.cs
index daeb186..d0013ba 100644
--- a/OpenSim/Region/Environment/Scenes/Scene.cs
+++ b/OpenSim/Region/Environment/Scenes/Scene.cs
@@ -2860,7 +2860,6 @@ namespace OpenSim.Region.Environment.Scenes
2860 if (RegionInfo.EstateSettings.IsBanned(agentId)) 2860 if (RegionInfo.EstateSettings.IsBanned(agentId))
2861 return; 2861 return;
2862 2862
2863
2864 String capsObjectPath = GetCapsPath(agentId); 2863 String capsObjectPath = GetCapsPath(agentId);
2865 2864
2866 m_log.DebugFormat( 2865 m_log.DebugFormat(
diff --git a/OpenSim/Tests/Common/Mock/TestCommunicationsManager.cs b/OpenSim/Tests/Common/Mock/TestCommunicationsManager.cs
index a6a025b..472645c 100644
--- a/OpenSim/Tests/Common/Mock/TestCommunicationsManager.cs
+++ b/OpenSim/Tests/Common/Mock/TestCommunicationsManager.cs
@@ -36,7 +36,12 @@ namespace OpenSim.Tests.Common.Mock
36 public class TestCommunicationsManager : CommunicationsManager 36 public class TestCommunicationsManager : CommunicationsManager
37 { 37 {
38 public TestCommunicationsManager() 38 public TestCommunicationsManager()
39 : base(null, null, null, false, null) 39 : this(null)
40 {
41 }
42
43 public TestCommunicationsManager(NetworkServersInfo serversInfo)
44 : base(serversInfo, null, null, false, null)
40 { 45 {
41 LocalInventoryService lis = new LocalInventoryService(); 46 LocalInventoryService lis = new LocalInventoryService();
42 m_interServiceInventoryService = lis; 47 m_interServiceInventoryService = lis;
@@ -44,7 +49,7 @@ namespace OpenSim.Tests.Common.Mock
44 49
45 LocalUserServices lus = new LocalUserServices(991, 992, lis); 50 LocalUserServices lus = new LocalUserServices(991, 992, lis);
46 m_userService = lus; 51 m_userService = lus;
47 m_userAdminService = lus; 52 m_userAdminService = lus;
48 } 53 }
49 } 54 }
50} 55}