diff options
author | Oren Hurvitz | 2012-08-13 16:02:50 +0300 |
---|---|---|
committer | Justin Clark-Casey (justincc) | 2012-10-25 23:32:37 +0100 |
commit | b4923da3348b05e4b85f842210bea4e6f08b4cef (patch) | |
tree | fa18078d623e061aaf0bbfbba4cb50e3218cddcf | |
parent | Changed duplicate Asset ID's to unique ID's in CollisionSoundsAssetSet.xml (diff) | |
download | opensim-SC-b4923da3348b05e4b85f842210bea4e6f08b4cef.zip opensim-SC-b4923da3348b05e4b85f842210bea4e6f08b4cef.tar.gz opensim-SC-b4923da3348b05e4b85f842210bea4e6f08b4cef.tar.bz2 opensim-SC-b4923da3348b05e4b85f842210bea4e6f08b4cef.tar.xz |
Changed "course" to "coarse" in several places
3 files changed, 18 insertions, 18 deletions
diff --git a/OpenSim/Region/Framework/Scenes/ScenePresence.cs b/OpenSim/Region/Framework/Scenes/ScenePresence.cs index 1222ac6..b6d0a3b 100644 --- a/OpenSim/Region/Framework/Scenes/ScenePresence.cs +++ b/OpenSim/Region/Framework/Scenes/ScenePresence.cs | |||
@@ -68,7 +68,7 @@ namespace OpenSim.Region.Framework.Scenes | |||
68 | public ScriptControlled eventControls; | 68 | public ScriptControlled eventControls; |
69 | } | 69 | } |
70 | 70 | ||
71 | public delegate void SendCourseLocationsMethod(UUID scene, ScenePresence presence, List<Vector3> coarseLocations, List<UUID> avatarUUIDs); | 71 | public delegate void SendCoarseLocationsMethod(UUID scene, ScenePresence presence, List<Vector3> coarseLocations, List<UUID> avatarUUIDs); |
72 | 72 | ||
73 | public class ScenePresence : EntityBase, IScenePresence | 73 | public class ScenePresence : EntityBase, IScenePresence |
74 | { | 74 | { |
@@ -186,7 +186,7 @@ namespace OpenSim.Region.Framework.Scenes | |||
186 | /// </summary> | 186 | /// </summary> |
187 | public bool SitGround { get; private set; } | 187 | public bool SitGround { get; private set; } |
188 | 188 | ||
189 | private SendCourseLocationsMethod m_sendCourseLocationsMethod; | 189 | private SendCoarseLocationsMethod m_sendCoarseLocationsMethod; |
190 | 190 | ||
191 | //private Vector3 m_requestedSitOffset = new Vector3(); | 191 | //private Vector3 m_requestedSitOffset = new Vector3(); |
192 | 192 | ||
@@ -695,7 +695,7 @@ namespace OpenSim.Region.Framework.Scenes | |||
695 | AttachmentsSyncLock = new Object(); | 695 | AttachmentsSyncLock = new Object(); |
696 | AllowMovement = true; | 696 | AllowMovement = true; |
697 | IsChildAgent = true; | 697 | IsChildAgent = true; |
698 | m_sendCourseLocationsMethod = SendCoarseLocationsDefault; | 698 | m_sendCoarseLocationsMethod = SendCoarseLocationsDefault; |
699 | Animator = new ScenePresenceAnimator(this); | 699 | Animator = new ScenePresenceAnimator(this); |
700 | PresenceType = type; | 700 | PresenceType = type; |
701 | DrawDistance = world.DefaultDrawDistance; | 701 | DrawDistance = world.DefaultDrawDistance; |
@@ -2432,17 +2432,17 @@ namespace OpenSim.Region.Framework.Scenes | |||
2432 | 2432 | ||
2433 | public void SendCoarseLocations(List<Vector3> coarseLocations, List<UUID> avatarUUIDs) | 2433 | public void SendCoarseLocations(List<Vector3> coarseLocations, List<UUID> avatarUUIDs) |
2434 | { | 2434 | { |
2435 | SendCourseLocationsMethod d = m_sendCourseLocationsMethod; | 2435 | SendCoarseLocationsMethod d = m_sendCoarseLocationsMethod; |
2436 | if (d != null) | 2436 | if (d != null) |
2437 | { | 2437 | { |
2438 | d.Invoke(m_scene.RegionInfo.originRegionID, this, coarseLocations, avatarUUIDs); | 2438 | d.Invoke(m_scene.RegionInfo.originRegionID, this, coarseLocations, avatarUUIDs); |
2439 | } | 2439 | } |
2440 | } | 2440 | } |
2441 | 2441 | ||
2442 | public void SetSendCourseLocationMethod(SendCourseLocationsMethod d) | 2442 | public void SetSendCoarseLocationMethod(SendCoarseLocationsMethod d) |
2443 | { | 2443 | { |
2444 | if (d != null) | 2444 | if (d != null) |
2445 | m_sendCourseLocationsMethod = d; | 2445 | m_sendCoarseLocationsMethod = d; |
2446 | } | 2446 | } |
2447 | 2447 | ||
2448 | public void SendCoarseLocationsDefault(UUID sceneId, ScenePresence p, List<Vector3> coarseLocations, List<UUID> avatarUUIDs) | 2448 | public void SendCoarseLocationsDefault(UUID sceneId, ScenePresence p, List<Vector3> coarseLocations, List<UUID> avatarUUIDs) |
@@ -2646,7 +2646,7 @@ namespace OpenSim.Region.Framework.Scenes | |||
2646 | #region Significant Movement Method | 2646 | #region Significant Movement Method |
2647 | 2647 | ||
2648 | /// <summary> | 2648 | /// <summary> |
2649 | /// This checks for a significant movement and sends a courselocationchange update | 2649 | /// This checks for a significant movement and sends a coarselocationchange update |
2650 | /// </summary> | 2650 | /// </summary> |
2651 | protected void CheckForSignificantMovement() | 2651 | protected void CheckForSignificantMovement() |
2652 | { | 2652 | { |
diff --git a/OpenSim/Region/RegionCombinerModule/RegionCombinerModule.cs b/OpenSim/Region/RegionCombinerModule/RegionCombinerModule.cs index 190fca0..905540d 100644 --- a/OpenSim/Region/RegionCombinerModule/RegionCombinerModule.cs +++ b/OpenSim/Region/RegionCombinerModule/RegionCombinerModule.cs | |||
@@ -719,21 +719,21 @@ namespace OpenSim.Region.RegionCombinerModule | |||
719 | rootConn.ClientEventForwarder = new RegionCombinerClientEventForwarder(rootConn); | 719 | rootConn.ClientEventForwarder = new RegionCombinerClientEventForwarder(rootConn); |
720 | 720 | ||
721 | // Sets up the CoarseLocationUpdate forwarder for this root region | 721 | // Sets up the CoarseLocationUpdate forwarder for this root region |
722 | scene.EventManager.OnNewPresence += SetCourseLocationDelegate; | 722 | scene.EventManager.OnNewPresence += SetCoarseLocationDelegate; |
723 | 723 | ||
724 | // Adds this root region to a dictionary of regions that are connectable | 724 | // Adds this root region to a dictionary of regions that are connectable |
725 | m_regions.Add(scene.RegionInfo.originRegionID, rootConn); | 725 | m_regions.Add(scene.RegionInfo.originRegionID, rootConn); |
726 | } | 726 | } |
727 | } | 727 | } |
728 | 728 | ||
729 | private void SetCourseLocationDelegate(ScenePresence presence) | 729 | private void SetCoarseLocationDelegate(ScenePresence presence) |
730 | { | 730 | { |
731 | presence.SetSendCourseLocationMethod(SendCourseLocationUpdates); | 731 | presence.SetSendCoarseLocationMethod(SendCoarseLocationUpdates); |
732 | } | 732 | } |
733 | 733 | ||
734 | // This delegate was refactored for non-combined regions. | 734 | // This delegate was refactored for non-combined regions. |
735 | // This combined region version will not use the pre-compiled lists of locations and ids | 735 | // This combined region version will not use the pre-compiled lists of locations and ids |
736 | private void SendCourseLocationUpdates(UUID sceneId, ScenePresence presence, List<Vector3> coarseLocations, List<UUID> avatarUUIDs) | 736 | private void SendCoarseLocationUpdates(UUID sceneId, ScenePresence presence, List<Vector3> coarseLocations, List<UUID> avatarUUIDs) |
737 | { | 737 | { |
738 | RegionConnections connectiondata = null; | 738 | RegionConnections connectiondata = null; |
739 | lock (m_regions) | 739 | lock (m_regions) |
@@ -756,18 +756,18 @@ namespace OpenSim.Region.RegionCombinerModule | |||
756 | } | 756 | } |
757 | }); | 757 | }); |
758 | 758 | ||
759 | DistributeCourseLocationUpdates(CoarseLocations, AvatarUUIDs, connectiondata, presence); | 759 | DistributeCoarseLocationUpdates(CoarseLocations, AvatarUUIDs, connectiondata, presence); |
760 | } | 760 | } |
761 | 761 | ||
762 | private void DistributeCourseLocationUpdates(List<Vector3> locations, List<UUID> uuids, | 762 | private void DistributeCoarseLocationUpdates(List<Vector3> locations, List<UUID> uuids, |
763 | RegionConnections connectiondata, ScenePresence rootPresence) | 763 | RegionConnections connectiondata, ScenePresence rootPresence) |
764 | { | 764 | { |
765 | RegionData[] rdata = connectiondata.ConnectedRegions.ToArray(); | 765 | RegionData[] rdata = connectiondata.ConnectedRegions.ToArray(); |
766 | //List<IClientAPI> clients = new List<IClientAPI>(); | 766 | //List<IClientAPI> clients = new List<IClientAPI>(); |
767 | Dictionary<Vector2, RegionCourseLocationStruct> updates = new Dictionary<Vector2, RegionCourseLocationStruct>(); | 767 | Dictionary<Vector2, RegionCoarseLocationStruct> updates = new Dictionary<Vector2, RegionCoarseLocationStruct>(); |
768 | 768 | ||
769 | // Root Region entry | 769 | // Root Region entry |
770 | RegionCourseLocationStruct rootupdatedata = new RegionCourseLocationStruct(); | 770 | RegionCoarseLocationStruct rootupdatedata = new RegionCoarseLocationStruct(); |
771 | rootupdatedata.Locations = new List<Vector3>(); | 771 | rootupdatedata.Locations = new List<Vector3>(); |
772 | rootupdatedata.Uuids = new List<UUID>(); | 772 | rootupdatedata.Uuids = new List<UUID>(); |
773 | rootupdatedata.Offset = Vector2.Zero; | 773 | rootupdatedata.Offset = Vector2.Zero; |
@@ -781,7 +781,7 @@ namespace OpenSim.Region.RegionCombinerModule | |||
781 | foreach (RegionData regiondata in rdata) | 781 | foreach (RegionData regiondata in rdata) |
782 | { | 782 | { |
783 | Vector2 offset = new Vector2(regiondata.Offset.X, regiondata.Offset.Y); | 783 | Vector2 offset = new Vector2(regiondata.Offset.X, regiondata.Offset.Y); |
784 | RegionCourseLocationStruct updatedata = new RegionCourseLocationStruct(); | 784 | RegionCoarseLocationStruct updatedata = new RegionCoarseLocationStruct(); |
785 | updatedata.Locations = new List<Vector3>(); | 785 | updatedata.Locations = new List<Vector3>(); |
786 | updatedata.Uuids = new List<UUID>(); | 786 | updatedata.Uuids = new List<UUID>(); |
787 | updatedata.Offset = offset; | 787 | updatedata.Offset = offset; |
@@ -807,7 +807,7 @@ namespace OpenSim.Region.RegionCombinerModule | |||
807 | if (!updates.ContainsKey(offset)) | 807 | if (!updates.ContainsKey(offset)) |
808 | { | 808 | { |
809 | // This shouldn't happen | 809 | // This shouldn't happen |
810 | RegionCourseLocationStruct updatedata = new RegionCourseLocationStruct(); | 810 | RegionCoarseLocationStruct updatedata = new RegionCoarseLocationStruct(); |
811 | updatedata.Locations = new List<Vector3>(); | 811 | updatedata.Locations = new List<Vector3>(); |
812 | updatedata.Uuids = new List<UUID>(); | 812 | updatedata.Uuids = new List<UUID>(); |
813 | updatedata.Offset = offset; | 813 | updatedata.Offset = offset; |
diff --git a/OpenSim/Region/RegionCombinerModule/RegionCourseLocation.cs b/OpenSim/Region/RegionCombinerModule/RegionCourseLocation.cs index 53a678f..224ac99 100644 --- a/OpenSim/Region/RegionCombinerModule/RegionCourseLocation.cs +++ b/OpenSim/Region/RegionCombinerModule/RegionCourseLocation.cs | |||
@@ -33,7 +33,7 @@ using OpenSim.Framework; | |||
33 | namespace OpenSim.Region.RegionCombinerModule | 33 | namespace OpenSim.Region.RegionCombinerModule |
34 | { | 34 | { |
35 | 35 | ||
36 | struct RegionCourseLocationStruct | 36 | struct RegionCoarseLocationStruct |
37 | { | 37 | { |
38 | public List<Vector3> Locations; | 38 | public List<Vector3> Locations; |
39 | public List<UUID> Uuids; | 39 | public List<UUID> Uuids; |