aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Region/Framework/Scenes/ScenePresence.cs
diff options
context:
space:
mode:
authorMelanie2012-01-07 18:11:21 +0000
committerMelanie2012-01-07 18:11:21 +0000
commit4bf2e19898c64060f05535d21711ccb0ff2c31cd (patch)
tree75447b09329bc66eec4191d1c02e7782cb780d67 /OpenSim/Region/Framework/Scenes/ScenePresence.cs
parentFix threat level setting on osNpcPlayAnimation (diff)
parentFix threat level setting on osNpcPlayAnimation (diff)
downloadopensim-SC-4bf2e19898c64060f05535d21711ccb0ff2c31cd.zip
opensim-SC-4bf2e19898c64060f05535d21711ccb0ff2c31cd.tar.gz
opensim-SC-4bf2e19898c64060f05535d21711ccb0ff2c31cd.tar.bz2
opensim-SC-4bf2e19898c64060f05535d21711ccb0ff2c31cd.tar.xz
Merge branch 'master' into careminster
Diffstat (limited to 'OpenSim/Region/Framework/Scenes/ScenePresence.cs')
-rw-r--r--OpenSim/Region/Framework/Scenes/ScenePresence.cs6
1 files changed, 4 insertions, 2 deletions
diff --git a/OpenSim/Region/Framework/Scenes/ScenePresence.cs b/OpenSim/Region/Framework/Scenes/ScenePresence.cs
index a301ccb..1232d0c 100644
--- a/OpenSim/Region/Framework/Scenes/ScenePresence.cs
+++ b/OpenSim/Region/Framework/Scenes/ScenePresence.cs
@@ -1282,8 +1282,8 @@ namespace OpenSim.Region.Framework.Scenes
1282 public void HandleAgentUpdate(IClientAPI remoteClient, AgentUpdateArgs agentData) 1282 public void HandleAgentUpdate(IClientAPI remoteClient, AgentUpdateArgs agentData)
1283 { 1283 {
1284// m_log.DebugFormat( 1284// m_log.DebugFormat(
1285// "[SCENE PRESENCE]: In {0} received agent update from {1}", 1285// "[SCENE PRESENCE]: In {0} received agent update from {1}, flags {2}",
1286// Scene.RegionInfo.RegionName, remoteClient.Name); 1286// Scene.RegionInfo.RegionName, remoteClient.Name, agentData.ControlFlags);
1287 1287
1288 if (IsChildAgent) 1288 if (IsChildAgent)
1289 { 1289 {
@@ -2323,6 +2323,8 @@ namespace OpenSim.Region.Framework.Scenes
2323 /// <param name="vec">The vector in which to move. This is relative to the rotation argument</param> 2323 /// <param name="vec">The vector in which to move. This is relative to the rotation argument</param>
2324 public void AddNewMovement(Vector3 vec) 2324 public void AddNewMovement(Vector3 vec)
2325 { 2325 {
2326// m_log.DebugFormat("[SCENE PRESENCE]: Adding new movement {0} for {1}", vec, Name);
2327
2326 Vector3 direc = vec * Rotation; 2328 Vector3 direc = vec * Rotation;
2327 direc.Normalize(); 2329 direc.Normalize();
2328 2330