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/Framework | |
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/Framework')
-rw-r--r-- | OpenSim/Region/Framework/Scenes/ScenePresence.cs | 14 |
1 files changed, 7 insertions, 7 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 | { |