diff options
author | Justin Clark-Casey (justincc) | 2013-09-18 23:09:38 +0100 |
---|---|---|
committer | Justin Clark-Casey (justincc) | 2013-09-18 23:09:38 +0100 |
commit | ddcbd4bb7d1518d0607d43e9d687faee186e9409 (patch) | |
tree | bc69f86190fafd3ebdaf86b204c2ab14a2c4aa9b /OpenSim | |
parent | minor: Make log message when Scene.IncomingChildAgentDateUpdate() more explic... (diff) | |
download | opensim-SC_OLD-ddcbd4bb7d1518d0607d43e9d687faee186e9409.zip opensim-SC_OLD-ddcbd4bb7d1518d0607d43e9d687faee186e9409.tar.gz opensim-SC_OLD-ddcbd4bb7d1518d0607d43e9d687faee186e9409.tar.bz2 opensim-SC_OLD-ddcbd4bb7d1518d0607d43e9d687faee186e9409.tar.xz |
refactor: rename *ChildAgentDataUpdate() methods to *UpdateChildAgent()
verb-noun is consistent with other similar methods
Diffstat (limited to 'OpenSim')
3 files changed, 10 insertions, 9 deletions
diff --git a/OpenSim/Region/CoreModules/ServiceConnectorsOut/Simulation/LocalSimulationConnector.cs b/OpenSim/Region/CoreModules/ServiceConnectorsOut/Simulation/LocalSimulationConnector.cs index e86d186..8ec943d 100644 --- a/OpenSim/Region/CoreModules/ServiceConnectorsOut/Simulation/LocalSimulationConnector.cs +++ b/OpenSim/Region/CoreModules/ServiceConnectorsOut/Simulation/LocalSimulationConnector.cs | |||
@@ -235,7 +235,7 @@ namespace OpenSim.Region.CoreModules.ServiceConnectorsOut.Simulation | |||
235 | // "[LOCAL SIMULATION CONNECTOR]: Found region {0} {1} to send AgentUpdate", | 235 | // "[LOCAL SIMULATION CONNECTOR]: Found region {0} {1} to send AgentUpdate", |
236 | // destination.RegionName, destination.RegionID); | 236 | // destination.RegionName, destination.RegionID); |
237 | 237 | ||
238 | return m_scenes[destination.RegionID].IncomingChildAgentDataUpdate(cAgentData); | 238 | return m_scenes[destination.RegionID].IncomingUpdateChildAgent(cAgentData); |
239 | } | 239 | } |
240 | 240 | ||
241 | // m_log.DebugFormat( | 241 | // m_log.DebugFormat( |
@@ -245,7 +245,7 @@ namespace OpenSim.Region.CoreModules.ServiceConnectorsOut.Simulation | |||
245 | return false; | 245 | return false; |
246 | } | 246 | } |
247 | 247 | ||
248 | public bool UpdateAgent(GridRegion destination, AgentPosition cAgentData) | 248 | public bool UpdateAgent(GridRegion destination, AgentPosition agentPosition) |
249 | { | 249 | { |
250 | if (destination == null) | 250 | if (destination == null) |
251 | return false; | 251 | return false; |
@@ -257,7 +257,7 @@ namespace OpenSim.Region.CoreModules.ServiceConnectorsOut.Simulation | |||
257 | foreach (Scene s in m_scenes.Values) | 257 | foreach (Scene s in m_scenes.Values) |
258 | { | 258 | { |
259 | // m_log.Debug("[LOCAL COMMS]: Found region to send ChildAgentUpdate"); | 259 | // m_log.Debug("[LOCAL COMMS]: Found region to send ChildAgentUpdate"); |
260 | s.IncomingChildAgentDataUpdate(cAgentData); | 260 | s.IncomingUpdateChildAgent(agentPosition); |
261 | } | 261 | } |
262 | 262 | ||
263 | //m_log.Debug("[LOCAL COMMS]: region not found for ChildAgentUpdate"); | 263 | //m_log.Debug("[LOCAL COMMS]: region not found for ChildAgentUpdate"); |
diff --git a/OpenSim/Region/Framework/Scenes/Scene.cs b/OpenSim/Region/Framework/Scenes/Scene.cs index 6c9a8df..758a012 100644 --- a/OpenSim/Region/Framework/Scenes/Scene.cs +++ b/OpenSim/Region/Framework/Scenes/Scene.cs | |||
@@ -4296,7 +4296,7 @@ namespace OpenSim.Region.Framework.Scenes | |||
4296 | /// <param name="cAgentData">Agent that contains all of the relevant things about an agent. | 4296 | /// <param name="cAgentData">Agent that contains all of the relevant things about an agent. |
4297 | /// Appearance, animations, position, etc.</param> | 4297 | /// Appearance, animations, position, etc.</param> |
4298 | /// <returns>true if we handled it.</returns> | 4298 | /// <returns>true if we handled it.</returns> |
4299 | public virtual bool IncomingChildAgentDataUpdate(AgentData cAgentData) | 4299 | public virtual bool IncomingUpdateChildAgent(AgentData cAgentData) |
4300 | { | 4300 | { |
4301 | m_log.DebugFormat( | 4301 | m_log.DebugFormat( |
4302 | "[SCENE]: Incoming child agent update for {0} in {1}", cAgentData.AgentID, RegionInfo.RegionName); | 4302 | "[SCENE]: Incoming child agent update for {0} in {1}", cAgentData.AgentID, RegionInfo.RegionName); |
@@ -4330,7 +4330,7 @@ namespace OpenSim.Region.Framework.Scenes | |||
4330 | sp.UUID, sp.ControllingClient.SessionId, cAgentData.SessionID)); | 4330 | sp.UUID, sp.ControllingClient.SessionId, cAgentData.SessionID)); |
4331 | } | 4331 | } |
4332 | 4332 | ||
4333 | sp.ChildAgentDataUpdate(cAgentData); | 4333 | sp.UpdateChildAgent(cAgentData); |
4334 | 4334 | ||
4335 | int ntimes = 20; | 4335 | int ntimes = 20; |
4336 | if (cAgentData.SenderWantsToWaitForRoot) | 4336 | if (cAgentData.SenderWantsToWaitForRoot) |
@@ -4363,7 +4363,7 @@ namespace OpenSim.Region.Framework.Scenes | |||
4363 | /// </summary> | 4363 | /// </summary> |
4364 | /// <param name="cAgentData">AgentPosition that contains agent positional data so we can know what to send</param> | 4364 | /// <param name="cAgentData">AgentPosition that contains agent positional data so we can know what to send</param> |
4365 | /// <returns>true if we handled it.</returns> | 4365 | /// <returns>true if we handled it.</returns> |
4366 | public virtual bool IncomingChildAgentDataUpdate(AgentPosition cAgentData) | 4366 | public virtual bool IncomingUpdateChildAgent(AgentPosition cAgentData) |
4367 | { | 4367 | { |
4368 | //m_log.Debug(" XXX Scene IncomingChildAgentDataUpdate POSITION in " + RegionInfo.RegionName); | 4368 | //m_log.Debug(" XXX Scene IncomingChildAgentDataUpdate POSITION in " + RegionInfo.RegionName); |
4369 | ScenePresence childAgentUpdate = GetScenePresence(cAgentData.AgentID); | 4369 | ScenePresence childAgentUpdate = GetScenePresence(cAgentData.AgentID); |
@@ -4383,7 +4383,7 @@ namespace OpenSim.Region.Framework.Scenes | |||
4383 | uint tRegionX = RegionInfo.RegionLocX; | 4383 | uint tRegionX = RegionInfo.RegionLocX; |
4384 | uint tRegionY = RegionInfo.RegionLocY; | 4384 | uint tRegionY = RegionInfo.RegionLocY; |
4385 | //Send Data to ScenePresence | 4385 | //Send Data to ScenePresence |
4386 | childAgentUpdate.ChildAgentDataUpdate(cAgentData, tRegionX, tRegionY, rRegionX, rRegionY); | 4386 | childAgentUpdate.UpdateChildAgent(cAgentData, tRegionX, tRegionY, rRegionX, rRegionY); |
4387 | // Not Implemented: | 4387 | // Not Implemented: |
4388 | //TODO: Do we need to pass the message on to one of our neighbors? | 4388 | //TODO: Do we need to pass the message on to one of our neighbors? |
4389 | } | 4389 | } |
diff --git a/OpenSim/Region/Framework/Scenes/ScenePresence.cs b/OpenSim/Region/Framework/Scenes/ScenePresence.cs index d542e47..3e61713 100644 --- a/OpenSim/Region/Framework/Scenes/ScenePresence.cs +++ b/OpenSim/Region/Framework/Scenes/ScenePresence.cs | |||
@@ -3341,7 +3341,7 @@ namespace OpenSim.Region.Framework.Scenes | |||
3341 | 3341 | ||
3342 | #region Child Agent Updates | 3342 | #region Child Agent Updates |
3343 | 3343 | ||
3344 | public void ChildAgentDataUpdate(AgentData cAgentData) | 3344 | public void UpdateChildAgent(AgentData cAgentData) |
3345 | { | 3345 | { |
3346 | // m_log.Debug(" >>> ChildAgentDataUpdate <<< " + Scene.RegionInfo.RegionName); | 3346 | // m_log.Debug(" >>> ChildAgentDataUpdate <<< " + Scene.RegionInfo.RegionName); |
3347 | if (!IsChildAgent) | 3347 | if (!IsChildAgent) |
@@ -3351,11 +3351,12 @@ namespace OpenSim.Region.Framework.Scenes | |||
3351 | } | 3351 | } |
3352 | 3352 | ||
3353 | private static Vector3 marker = new Vector3(-1f, -1f, -1f); | 3353 | private static Vector3 marker = new Vector3(-1f, -1f, -1f); |
3354 | |||
3354 | /// <summary> | 3355 | /// <summary> |
3355 | /// This updates important decision making data about a child agent | 3356 | /// This updates important decision making data about a child agent |
3356 | /// The main purpose is to figure out what objects to send to a child agent that's in a neighboring region | 3357 | /// The main purpose is to figure out what objects to send to a child agent that's in a neighboring region |
3357 | /// </summary> | 3358 | /// </summary> |
3358 | public void ChildAgentDataUpdate(AgentPosition cAgentData, uint tRegionX, uint tRegionY, uint rRegionX, uint rRegionY) | 3359 | public void UpdateChildAgent(AgentPosition cAgentData, uint tRegionX, uint tRegionY, uint rRegionX, uint rRegionY) |
3359 | { | 3360 | { |
3360 | if (!IsChildAgent) | 3361 | if (!IsChildAgent) |
3361 | return; | 3362 | return; |