aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Region/Communications/Local
diff options
context:
space:
mode:
Diffstat (limited to 'OpenSim/Region/Communications/Local')
-rw-r--r--OpenSim/Region/Communications/Local/LocalBackEndServices.cs11
-rw-r--r--OpenSim/Region/Communications/Local/LocalLoginService.cs4
2 files changed, 10 insertions, 5 deletions
diff --git a/OpenSim/Region/Communications/Local/LocalBackEndServices.cs b/OpenSim/Region/Communications/Local/LocalBackEndServices.cs
index ddba124..552f8c3 100644
--- a/OpenSim/Region/Communications/Local/LocalBackEndServices.cs
+++ b/OpenSim/Region/Communications/Local/LocalBackEndServices.cs
@@ -333,7 +333,7 @@ namespace OpenSim.Region.Communications.Local
333 } 333 }
334 334
335 /// <summary> 335 /// <summary>
336 /// 336 /// Tell a region to expect a new client connection.
337 /// </summary> 337 /// </summary>
338 /// <param name="regionHandle"></param> 338 /// <param name="regionHandle"></param>
339 /// <param name="agentData"></param> 339 /// <param name="agentData"></param>
@@ -355,6 +355,14 @@ namespace OpenSim.Region.Communications.Local
355 return false; 355 return false;
356 } 356 }
357 357
358 /// <summary>
359 /// Tell a region to expect the crossing in of a new prim.
360 /// </summary>
361 /// <param name="regionHandle"></param>
362 /// <param name="primID"></param>
363 /// <param name="objData"></param>
364 /// <param name="XMLMethod"></param>
365 /// <returns></returns>
358 public bool InformRegionOfPrimCrossing(ulong regionHandle, UUID primID, string objData, int XMLMethod) 366 public bool InformRegionOfPrimCrossing(ulong regionHandle, UUID primID, string objData, int XMLMethod)
359 { 367 {
360 if (m_regionListeners.ContainsKey(regionHandle)) 368 if (m_regionListeners.ContainsKey(regionHandle))
@@ -431,7 +439,6 @@ namespace OpenSim.Region.Communications.Local
431 agent.BaseFolder = loginData.BaseFolder; 439 agent.BaseFolder = loginData.BaseFolder;
432 agent.InventoryFolder = loginData.InventoryFolder; 440 agent.InventoryFolder = loginData.InventoryFolder;
433 agent.startpos = loginData.StartPos; 441 agent.startpos = loginData.StartPos;
434
435 agent.CapsPath = loginData.CapsPath; 442 agent.CapsPath = loginData.CapsPath;
436 443
437 TriggerExpectUser(regionHandle, agent); 444 TriggerExpectUser(regionHandle, agent);
diff --git a/OpenSim/Region/Communications/Local/LocalLoginService.cs b/OpenSim/Region/Communications/Local/LocalLoginService.cs
index 70be635..9caeda4 100644
--- a/OpenSim/Region/Communications/Local/LocalLoginService.cs
+++ b/OpenSim/Region/Communications/Local/LocalLoginService.cs
@@ -176,6 +176,7 @@ namespace OpenSim.Region.Communications.Local
176 regionX, regionY, 176 regionX, regionY,
177 theUser.HomeLocation.X, theUser.HomeLocation.Y, theUser.HomeLocation.Z, 177 theUser.HomeLocation.X, theUser.HomeLocation.Y, theUser.HomeLocation.Z,
178 theUser.HomeLookAt.X, theUser.HomeLookAt.Y, theUser.HomeLookAt.Z); 178 theUser.HomeLookAt.X, theUser.HomeLookAt.Y, theUser.HomeLookAt.Z);
179
179 m_log.InfoFormat("[LOGIN] Home region of user {0} {1} is not available; using computed region position {2} {3}", 180 m_log.InfoFormat("[LOGIN] Home region of user {0} {1} is not available; using computed region position {2} {3}",
180 theUser.FirstName, theUser.SurName, 181 theUser.FirstName, theUser.SurName,
181 regionX, regionY); 182 regionX, regionY);
@@ -318,9 +319,6 @@ namespace OpenSim.Region.Communications.Local
318 seedcap = "http://" + regionInfo.ExternalEndPoint.Address.ToString() + ":" + serversInfo.HttpListenerPort + "/CAPS/" + capsPath + "0000/"; 319 seedcap = "http://" + regionInfo.ExternalEndPoint.Address.ToString() + ":" + serversInfo.HttpListenerPort + "/CAPS/" + capsPath + "0000/";
319 } 320 }
320 321
321
322
323
324 response.SeedCapability = seedcap; //regionInfo.ExternalEndPoint.Address.ToString() + ":" + regionInfo.HttpPort + "/CAPS/" + capsPath + "0000/"; 322 response.SeedCapability = seedcap; //regionInfo.ExternalEndPoint.Address.ToString() + ":" + regionInfo.HttpPort + "/CAPS/" + capsPath + "0000/";
325 323
326 // Notify the target of an incoming user 324 // Notify the target of an incoming user