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

refactor: rename *ChildAgentDataUpdate() methods to *UpdateChildAgent() 

verb-noun is consistent with other similar methods
varregion
Justin Clark-Casey (justincc) 2013-09-18 23:09:38 +01:00
parent 3ce46adb2a
commit ddcbd4bb7d
3 changed files with 10 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
OpenSim/Region/CoreModules/ServiceConnectorsOut/Simulation/LocalSimulationConnector.cs
View File

@ -235,7 +235,7 @@ namespace OpenSim.Region.CoreModules.ServiceConnectorsOut.Simulation
// "[LOCAL SIMULATION CONNECTOR]: Found region {0} {1} to send AgentUpdate", // "[LOCAL SIMULATION CONNECTOR]: Found region {0} {1} to send AgentUpdate",
// destination.RegionName, destination.RegionID); // destination.RegionName, destination.RegionID);
return m_scenes[destination.RegionID].IncomingChildAgentDataUpdate(cAgentData); return m_scenes[destination.RegionID].IncomingUpdateChildAgent(cAgentData);
} }
// m_log.DebugFormat( // m_log.DebugFormat(
@ -245,7 +245,7 @@ namespace OpenSim.Region.CoreModules.ServiceConnectorsOut.Simulation
return false; return false;
} }
public bool UpdateAgent(GridRegion destination, AgentPosition cAgentData) public bool UpdateAgent(GridRegion destination, AgentPosition agentPosition)
{ {
if (destination == null) if (destination == null)
return false; return false;
@ -257,7 +257,7 @@ namespace OpenSim.Region.CoreModules.ServiceConnectorsOut.Simulation
foreach (Scene s in m_scenes.Values) foreach (Scene s in m_scenes.Values)
{ {
// m_log.Debug("[LOCAL COMMS]: Found region to send ChildAgentUpdate"); // m_log.Debug("[LOCAL COMMS]: Found region to send ChildAgentUpdate");
s.IncomingChildAgentDataUpdate(cAgentData); s.IncomingUpdateChildAgent(agentPosition);
} }
//m_log.Debug("[LOCAL COMMS]: region not found for ChildAgentUpdate"); //m_log.Debug("[LOCAL COMMS]: region not found for ChildAgentUpdate");

8
OpenSim/Region/Framework/Scenes/Scene.cs
View File

@ -4296,7 +4296,7 @@ namespace OpenSim.Region.Framework.Scenes
/// <param name="cAgentData">Agent that contains all of the relevant things about an agent. /// <param name="cAgentData">Agent that contains all of the relevant things about an agent.
/// Appearance, animations, position, etc.</param> /// Appearance, animations, position, etc.</param>
/// <returns>true if we handled it.</returns> /// <returns>true if we handled it.</returns>
public virtual bool IncomingChildAgentDataUpdate(AgentData cAgentData) public virtual bool IncomingUpdateChildAgent(AgentData cAgentData)
{ {
m_log.DebugFormat( m_log.DebugFormat(
"[SCENE]: Incoming child agent update for {0} in {1}", cAgentData.AgentID, RegionInfo.RegionName); "[SCENE]: Incoming child agent update for {0} in {1}", cAgentData.AgentID, RegionInfo.RegionName);
@ -4330,7 +4330,7 @@ namespace OpenSim.Region.Framework.Scenes
sp.UUID, sp.ControllingClient.SessionId, cAgentData.SessionID)); sp.UUID, sp.ControllingClient.SessionId, cAgentData.SessionID));
} }
sp.ChildAgentDataUpdate(cAgentData); sp.UpdateChildAgent(cAgentData);
int ntimes = 20; int ntimes = 20;
if (cAgentData.SenderWantsToWaitForRoot) if (cAgentData.SenderWantsToWaitForRoot)
@ -4363,7 +4363,7 @@ namespace OpenSim.Region.Framework.Scenes
/// </summary> /// </summary>
/// <param name="cAgentData">AgentPosition that contains agent positional data so we can know what to send</param> /// <param name="cAgentData">AgentPosition that contains agent positional data so we can know what to send</param>
/// <returns>true if we handled it.</returns> /// <returns>true if we handled it.</returns>
public virtual bool IncomingChildAgentDataUpdate(AgentPosition cAgentData) public virtual bool IncomingUpdateChildAgent(AgentPosition cAgentData)
{ {
//m_log.Debug(" XXX Scene IncomingChildAgentDataUpdate POSITION in " + RegionInfo.RegionName); //m_log.Debug(" XXX Scene IncomingChildAgentDataUpdate POSITION in " + RegionInfo.RegionName);
ScenePresence childAgentUpdate = GetScenePresence(cAgentData.AgentID); ScenePresence childAgentUpdate = GetScenePresence(cAgentData.AgentID);
@ -4383,7 +4383,7 @@ namespace OpenSim.Region.Framework.Scenes
uint tRegionX = RegionInfo.RegionLocX; uint tRegionX = RegionInfo.RegionLocX;
uint tRegionY = RegionInfo.RegionLocY; uint tRegionY = RegionInfo.RegionLocY;
//Send Data to ScenePresence //Send Data to ScenePresence
childAgentUpdate.ChildAgentDataUpdate(cAgentData, tRegionX, tRegionY, rRegionX, rRegionY); childAgentUpdate.UpdateChildAgent(cAgentData, tRegionX, tRegionY, rRegionX, rRegionY);
// Not Implemented: // Not Implemented:
//TODO: Do we need to pass the message on to one of our neighbors? //TODO: Do we need to pass the message on to one of our neighbors?
} }

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

@ -3341,7 +3341,7 @@ namespace OpenSim.Region.Framework.Scenes
#region Child Agent Updates #region Child Agent Updates
public void ChildAgentDataUpdate(AgentData cAgentData) public void UpdateChildAgent(AgentData cAgentData)
{ {
// m_log.Debug(" >>> ChildAgentDataUpdate <<< " + Scene.RegionInfo.RegionName); // m_log.Debug(" >>> ChildAgentDataUpdate <<< " + Scene.RegionInfo.RegionName);
if (!IsChildAgent) if (!IsChildAgent)
@ -3351,11 +3351,12 @@ namespace OpenSim.Region.Framework.Scenes
} }
private static Vector3 marker = new Vector3(-1f, -1f, -1f); private static Vector3 marker = new Vector3(-1f, -1f, -1f);
/// <summary> /// <summary>
/// This updates important decision making data about a child agent /// This updates important decision making data about a child agent
/// The main purpose is to figure out what objects to send to a child agent that's in a neighboring region /// The main purpose is to figure out what objects to send to a child agent that's in a neighboring region
/// </summary> /// </summary>
public void ChildAgentDataUpdate(AgentPosition cAgentData, uint tRegionX, uint tRegionY, uint rRegionX, uint rRegionY) public void UpdateChildAgent(AgentPosition cAgentData, uint tRegionX, uint tRegionY, uint rRegionX, uint rRegionY)
{ {
if (!IsChildAgent) if (!IsChildAgent)
return; return;