aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Region
diff options
context:
space:
mode:
authorJustin Clarke Casey2009-01-19 17:15:27 +0000
committerJustin Clarke Casey2009-01-19 17:15:27 +0000
commit96e15058d5928c3d11a37e5e3ecdb2e2fb0d805f (patch)
tree2c1ff47911f5f77217b082f8c4788d76b67395bc /OpenSim/Region
parent* Progressive texture patch + PriorityQueue put into the LLClient namespace. (diff)
downloadopensim-SC_OLD-96e15058d5928c3d11a37e5e3ecdb2e2fb0d805f.zip
opensim-SC_OLD-96e15058d5928c3d11a37e5e3ecdb2e2fb0d805f.tar.gz
opensim-SC_OLD-96e15058d5928c3d11a37e5e3ecdb2e2fb0d805f.tar.bz2
opensim-SC_OLD-96e15058d5928c3d11a37e5e3ecdb2e2fb0d805f.tar.xz
* minor: Just some minor log elaboration to reveal in the logs where a teleport is being directed rather than just its position
Diffstat (limited to 'OpenSim/Region')
-rw-r--r--OpenSim/Region/Environment/Modules/Communications/REST/RESTInterregionComms.cs13
-rw-r--r--OpenSim/Region/Environment/Scenes/SceneCommunicationService.cs11
2 files changed, 16 insertions, 8 deletions
diff --git a/OpenSim/Region/Environment/Modules/Communications/REST/RESTInterregionComms.cs b/OpenSim/Region/Environment/Modules/Communications/REST/RESTInterregionComms.cs
index 82ed5d4..b4302fd 100644
--- a/OpenSim/Region/Environment/Modules/Communications/REST/RESTInterregionComms.cs
+++ b/OpenSim/Region/Environment/Modules/Communications/REST/RESTInterregionComms.cs
@@ -184,6 +184,7 @@ namespace OpenSim.Region.Environment.Modules.Communications.REST
184 return false; 184 return false;
185 185
186 } 186 }
187
187 public bool SendReleaseAgent(ulong regionHandle, UUID id, string uri) 188 public bool SendReleaseAgent(ulong regionHandle, UUID id, string uri)
188 { 189 {
189 // Try local first 190 // Try local first
@@ -209,11 +210,12 @@ namespace OpenSim.Region.Environment.Modules.Communications.REST
209 //else 210 //else
210 // m_log.Warn("[REST COMMS]: Region not found " + regionHandle); 211 // m_log.Warn("[REST COMMS]: Region not found " + regionHandle);
211 return false; 212 return false;
212 } 213 }
213 214
214 #endregion /* IInterregionComms */ 215 #endregion /* IInterregionComms */
215 216
216 #region DoWork functions for the above public interface 217 #region DoWork functions for the above public interface
218
217 //------------------------------------------------------------------- 219 //-------------------------------------------------------------------
218 // Internal functions for the above public interface 220 // Internal functions for the above public interface
219 //------------------------------------------------------------------- 221 //-------------------------------------------------------------------
@@ -385,7 +387,6 @@ namespace OpenSim.Region.Environment.Modules.Communications.REST
385 } 387 }
386 388
387 return true; 389 return true;
388
389 } 390 }
390 391
391 protected bool DoReleaseAgentCall(ulong regionHandle, UUID id, string uri) 392 protected bool DoReleaseAgentCall(ulong regionHandle, UUID id, string uri)
@@ -418,7 +419,6 @@ namespace OpenSim.Region.Environment.Modules.Communications.REST
418 } 419 }
419 420
420 return true; 421 return true;
421
422 } 422 }
423 423
424 protected bool DoCloseAgentCall(RegionInfo region, UUID id) 424 protected bool DoCloseAgentCall(RegionInfo region, UUID id)
@@ -453,10 +453,9 @@ namespace OpenSim.Region.Environment.Modules.Communications.REST
453 } 453 }
454 454
455 return true; 455 return true;
456
457 } 456 }
458 457
459 #endregion /* DoWork */ 458 #endregion /* Do Work */
460 459
461 #region Incoming calls from remote instances 460 #region Incoming calls from remote instances
462 461
@@ -653,9 +652,11 @@ namespace OpenSim.Region.Environment.Modules.Communications.REST
653 responsedata["int_response_code"] = 200; 652 responsedata["int_response_code"] = 200;
654 responsedata["str_response_string"] = "OpenSim agent " + id.ToString(); 653 responsedata["str_response_string"] = "OpenSim agent " + id.ToString();
655 } 654 }
655
656 #endregion 656 #endregion
657 657
658 #region Misc 658 #region Misc
659
659 /// <summary> 660 /// <summary>
660 /// Extract the param from an uri. 661 /// Extract the param from an uri.
661 /// </summary> 662 /// </summary>
diff --git a/OpenSim/Region/Environment/Scenes/SceneCommunicationService.cs b/OpenSim/Region/Environment/Scenes/SceneCommunicationService.cs
index 4f3863c..74f5dc7 100644
--- a/OpenSim/Region/Environment/Scenes/SceneCommunicationService.cs
+++ b/OpenSim/Region/Environment/Scenes/SceneCommunicationService.cs
@@ -680,8 +680,6 @@ namespace OpenSim.Region.Environment.Scenes
680 public virtual void RequestTeleportToLocation(ScenePresence avatar, ulong regionHandle, Vector3 position, 680 public virtual void RequestTeleportToLocation(ScenePresence avatar, ulong regionHandle, Vector3 position,
681 Vector3 lookAt, uint teleportFlags) 681 Vector3 lookAt, uint teleportFlags)
682 { 682 {
683 m_log.DebugFormat("[SCENE COMMUNICATION SERVICE]: RequestTeleportToLocation {0} ", position.ToString());
684
685 if (!avatar.Scene.Permissions.CanTeleport(avatar.UUID)) 683 if (!avatar.Scene.Permissions.CanTeleport(avatar.UUID))
686 return; 684 return;
687 685
@@ -691,6 +689,10 @@ namespace OpenSim.Region.Environment.Scenes
691 689
692 if (regionHandle == m_regionInfo.RegionHandle) 690 if (regionHandle == m_regionInfo.RegionHandle)
693 { 691 {
692 m_log.DebugFormat(
693 "[SCENE COMMUNICATION SERVICE]: RequestTeleportToLocation {0} within {1}",
694 position, m_regionInfo.RegionName);
695
694 // Teleport within the same region 696 // Teleport within the same region
695 if (position.X < 0 || position.X > Constants.RegionSize || position.Y < 0 || position.Y > Constants.RegionSize || position.Z < 0) 697 if (position.X < 0 || position.X > Constants.RegionSize || position.Y < 0 || position.Y > Constants.RegionSize || position.Z < 0)
696 { 698 {
@@ -723,6 +725,10 @@ namespace OpenSim.Region.Environment.Scenes
723 RegionInfo reg = RequestNeighbouringRegionInfo(regionHandle); 725 RegionInfo reg = RequestNeighbouringRegionInfo(regionHandle);
724 if (reg != null) 726 if (reg != null)
725 { 727 {
728 m_log.DebugFormat(
729 "[SCENE COMMUNICATION SERVICE]: RequestTeleportToLocation to {0} {1}",
730 position, reg.RegionName);
731
726 if (eq == null) 732 if (eq == null)
727 avatar.ControllingClient.SendTeleportLocationStart(); 733 avatar.ControllingClient.SendTeleportLocationStart();
728 734
@@ -870,6 +876,7 @@ namespace OpenSim.Region.Environment.Scenes
870 avatar.ControllingClient.SendTeleportFailed("Problems connecting to destination."); 876 avatar.ControllingClient.SendTeleportFailed("Problems connecting to destination.");
871 877
872 ResetFromTransit(avatar.UUID); 878 ResetFromTransit(avatar.UUID);
879
873 // Yikes! We should just have a ref to scene here. 880 // Yikes! We should just have a ref to scene here.
874 avatar.Scene.InformClientOfNeighbours(avatar); 881 avatar.Scene.InformClientOfNeighbours(avatar);
875 882