OpenSim
/
OpenSimMirror
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Changed "course" to "coarse" in several places

integration
Oren Hurvitz 2012-08-13 16:02:50 +03:00 committed by Justin Clark-Casey (justincc)
parent 424f68b64b
commit b4923da334
3 changed files with 18 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
OpenSim/Region/Framework/Scenes/ScenePresence.cs
View File

@ -68,7 +68,7 @@ namespace OpenSim.Region.Framework.Scenes
public ScriptControlled eventControls; public ScriptControlled eventControls;
} }
public delegate void SendCourseLocationsMethod(UUID scene, ScenePresence presence, List<Vector3> coarseLocations, List<UUID> avatarUUIDs); public delegate void SendCoarseLocationsMethod(UUID scene, ScenePresence presence, List<Vector3> coarseLocations, List<UUID> avatarUUIDs);
public class ScenePresence : EntityBase, IScenePresence public class ScenePresence : EntityBase, IScenePresence
{ {
@ -186,7 +186,7 @@ namespace OpenSim.Region.Framework.Scenes
/// </summary> /// </summary>
public bool SitGround { get; private set; } public bool SitGround { get; private set; }
private SendCourseLocationsMethod m_sendCourseLocationsMethod; private SendCoarseLocationsMethod m_sendCoarseLocationsMethod;
//private Vector3 m_requestedSitOffset = new Vector3(); //private Vector3 m_requestedSitOffset = new Vector3();
@ -695,7 +695,7 @@ namespace OpenSim.Region.Framework.Scenes
AttachmentsSyncLock = new Object(); AttachmentsSyncLock = new Object();
AllowMovement = true; AllowMovement = true;
IsChildAgent = true; IsChildAgent = true;
m_sendCourseLocationsMethod = SendCoarseLocationsDefault; m_sendCoarseLocationsMethod = SendCoarseLocationsDefault;
Animator = new ScenePresenceAnimator(this); Animator = new ScenePresenceAnimator(this);
PresenceType = type; PresenceType = type;
DrawDistance = world.DefaultDrawDistance; DrawDistance = world.DefaultDrawDistance;
@ -2432,17 +2432,17 @@ namespace OpenSim.Region.Framework.Scenes
public void SendCoarseLocations(List<Vector3> coarseLocations, List<UUID> avatarUUIDs) public void SendCoarseLocations(List<Vector3> coarseLocations, List<UUID> avatarUUIDs)
{ {
SendCourseLocationsMethod d = m_sendCourseLocationsMethod; SendCoarseLocationsMethod d = m_sendCoarseLocationsMethod;
if (d != null) if (d != null)
{ {
d.Invoke(m_scene.RegionInfo.originRegionID, this, coarseLocations, avatarUUIDs); d.Invoke(m_scene.RegionInfo.originRegionID, this, coarseLocations, avatarUUIDs);
} }
} }
public void SetSendCourseLocationMethod(SendCourseLocationsMethod d) public void SetSendCoarseLocationMethod(SendCoarseLocationsMethod d)
{ {
if (d != null) if (d != null)
m_sendCourseLocationsMethod = d; m_sendCoarseLocationsMethod = d;
} }
public void SendCoarseLocationsDefault(UUID sceneId, ScenePresence p, List<Vector3> coarseLocations, List<UUID> avatarUUIDs) public void SendCoarseLocationsDefault(UUID sceneId, ScenePresence p, List<Vector3> coarseLocations, List<UUID> avatarUUIDs)
@ -2646,7 +2646,7 @@ namespace OpenSim.Region.Framework.Scenes
#region Significant Movement Method #region Significant Movement Method
/// <summary> /// <summary>
/// This checks for a significant movement and sends a courselocationchange update /// This checks for a significant movement and sends a coarselocationchange update
/// </summary> /// </summary>
protected void CheckForSignificantMovement() protected void CheckForSignificantMovement()
{ {

20
OpenSim/Region/RegionCombinerModule/RegionCombinerModule.cs
View File

@ -719,21 +719,21 @@ namespace OpenSim.Region.RegionCombinerModule
rootConn.ClientEventForwarder = new RegionCombinerClientEventForwarder(rootConn); rootConn.ClientEventForwarder = new RegionCombinerClientEventForwarder(rootConn);
// Sets up the CoarseLocationUpdate forwarder for this root region // Sets up the CoarseLocationUpdate forwarder for this root region
scene.EventManager.OnNewPresence += SetCourseLocationDelegate; scene.EventManager.OnNewPresence += SetCoarseLocationDelegate;
// Adds this root region to a dictionary of regions that are connectable // Adds this root region to a dictionary of regions that are connectable
m_regions.Add(scene.RegionInfo.originRegionID, rootConn); m_regions.Add(scene.RegionInfo.originRegionID, rootConn);
} }
} }
private void SetCourseLocationDelegate(ScenePresence presence) private void SetCoarseLocationDelegate(ScenePresence presence)
{ {
presence.SetSendCourseLocationMethod(SendCourseLocationUpdates); presence.SetSendCoarseLocationMethod(SendCoarseLocationUpdates);
} }
// This delegate was refactored for non-combined regions. // This delegate was refactored for non-combined regions.
// This combined region version will not use the pre-compiled lists of locations and ids // This combined region version will not use the pre-compiled lists of locations and ids
private void SendCourseLocationUpdates(UUID sceneId, ScenePresence presence, List<Vector3> coarseLocations, List<UUID> avatarUUIDs) private void SendCoarseLocationUpdates(UUID sceneId, ScenePresence presence, List<Vector3> coarseLocations, List<UUID> avatarUUIDs)
{ {
RegionConnections connectiondata = null; RegionConnections connectiondata = null;
lock (m_regions) lock (m_regions)
@ -756,18 +756,18 @@ namespace OpenSim.Region.RegionCombinerModule
} }
}); });
DistributeCourseLocationUpdates(CoarseLocations, AvatarUUIDs, connectiondata, presence); DistributeCoarseLocationUpdates(CoarseLocations, AvatarUUIDs, connectiondata, presence);
} }
private void DistributeCourseLocationUpdates(List<Vector3> locations, List<UUID> uuids, private void DistributeCoarseLocationUpdates(List<Vector3> locations, List<UUID> uuids,
RegionConnections connectiondata, ScenePresence rootPresence) RegionConnections connectiondata, ScenePresence rootPresence)
{ {
RegionData[] rdata = connectiondata.ConnectedRegions.ToArray(); RegionData[] rdata = connectiondata.ConnectedRegions.ToArray();
//List<IClientAPI> clients = new List<IClientAPI>(); //List<IClientAPI> clients = new List<IClientAPI>();
Dictionary<Vector2, RegionCourseLocationStruct> updates = new Dictionary<Vector2, RegionCourseLocationStruct>(); Dictionary<Vector2, RegionCoarseLocationStruct> updates = new Dictionary<Vector2, RegionCoarseLocationStruct>();
// Root Region entry // Root Region entry
RegionCourseLocationStruct rootupdatedata = new RegionCourseLocationStruct(); RegionCoarseLocationStruct rootupdatedata = new RegionCoarseLocationStruct();
rootupdatedata.Locations = new List<Vector3>(); rootupdatedata.Locations = new List<Vector3>();
rootupdatedata.Uuids = new List<UUID>(); rootupdatedata.Uuids = new List<UUID>();
rootupdatedata.Offset = Vector2.Zero; rootupdatedata.Offset = Vector2.Zero;
@ -781,7 +781,7 @@ namespace OpenSim.Region.RegionCombinerModule
foreach (RegionData regiondata in rdata) foreach (RegionData regiondata in rdata)
{ {
Vector2 offset = new Vector2(regiondata.Offset.X, regiondata.Offset.Y); Vector2 offset = new Vector2(regiondata.Offset.X, regiondata.Offset.Y);
RegionCourseLocationStruct updatedata = new RegionCourseLocationStruct(); RegionCoarseLocationStruct updatedata = new RegionCoarseLocationStruct();
updatedata.Locations = new List<Vector3>(); updatedata.Locations = new List<Vector3>();
updatedata.Uuids = new List<UUID>(); updatedata.Uuids = new List<UUID>();
updatedata.Offset = offset; updatedata.Offset = offset;
@ -807,7 +807,7 @@ namespace OpenSim.Region.RegionCombinerModule
if (!updates.ContainsKey(offset)) if (!updates.ContainsKey(offset))
{ {
// This shouldn't happen // This shouldn't happen
RegionCourseLocationStruct updatedata = new RegionCourseLocationStruct(); RegionCoarseLocationStruct updatedata = new RegionCoarseLocationStruct();
updatedata.Locations = new List<Vector3>(); updatedata.Locations = new List<Vector3>();
updatedata.Uuids = new List<UUID>(); updatedata.Uuids = new List<UUID>();
updatedata.Offset = offset; updatedata.Offset = offset;

2
OpenSim/Region/RegionCombinerModule/RegionCourseLocation.cs
View File

@ -33,7 +33,7 @@ using OpenSim.Framework;
namespace OpenSim.Region.RegionCombinerModule namespace OpenSim.Region.RegionCombinerModule
{ {
struct RegionCourseLocationStruct struct RegionCoarseLocationStruct
{ {
public List<Vector3> Locations; public List<Vector3> Locations;
public List<UUID> Uuids; public List<UUID> Uuids;