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 /OpenSim/Region/RegionCombinerModule/RegionCombinerModule.cs | |
parent | Changed duplicate Asset ID's to unique ID's in CollisionSoundsAssetSet.xml (diff) | |
download | opensim-SC_OLD-b4923da3348b05e4b85f842210bea4e6f08b4cef.zip opensim-SC_OLD-b4923da3348b05e4b85f842210bea4e6f08b4cef.tar.gz opensim-SC_OLD-b4923da3348b05e4b85f842210bea4e6f08b4cef.tar.bz2 opensim-SC_OLD-b4923da3348b05e4b85f842210bea4e6f08b4cef.tar.xz |
Changed "course" to "coarse" in several places
Diffstat (limited to 'OpenSim/Region/RegionCombinerModule/RegionCombinerModule.cs')
-rw-r--r-- | OpenSim/Region/RegionCombinerModule/RegionCombinerModule.cs | 20 |
1 files changed, 10 insertions, 10 deletions
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; |