diff options
Diffstat (limited to '')
-rw-r--r-- | OpenSim/Region/Environment/Scenes/ScenePresence.cs | 14 |
1 files changed, 8 insertions, 6 deletions
diff --git a/OpenSim/Region/Environment/Scenes/ScenePresence.cs b/OpenSim/Region/Environment/Scenes/ScenePresence.cs index 659a1f5..5c33dfc 100644 --- a/OpenSim/Region/Environment/Scenes/ScenePresence.cs +++ b/OpenSim/Region/Environment/Scenes/ScenePresence.cs | |||
@@ -39,6 +39,8 @@ namespace OpenSim.Region.Environment.Scenes | |||
39 | { | 39 | { |
40 | public class ScenePresence : EntityBase | 40 | public class ScenePresence : EntityBase |
41 | { | 41 | { |
42 | private static readonly log4net.ILog m_log = log4net.LogManager.GetLogger(System.Reflection.MethodBase.GetCurrentMethod().DeclaringType); | ||
43 | |||
42 | public static AvatarAnimations Animations; | 44 | public static AvatarAnimations Animations; |
43 | public static byte[] DefaultTexture; | 45 | public static byte[] DefaultTexture; |
44 | public LLUUID currentParcelUUID = LLUUID.Zero; | 46 | public LLUUID currentParcelUUID = LLUUID.Zero; |
@@ -345,7 +347,7 @@ namespace OpenSim.Region.Environment.Scenes | |||
345 | } | 347 | } |
346 | catch (KeyNotFoundException) | 348 | catch (KeyNotFoundException) |
347 | { | 349 | { |
348 | MainLog.Instance.Warn("AVATAR", "KeyNotFound Exception playing avatar stand animation"); | 350 | m_log.Warn("[AVATAR]: KeyNotFound Exception playing avatar stand animation"); |
349 | } | 351 | } |
350 | m_animationSeqs.Add(1); | 352 | m_animationSeqs.Add(1); |
351 | 353 | ||
@@ -933,7 +935,7 @@ namespace OpenSim.Region.Environment.Scenes | |||
933 | } | 935 | } |
934 | else | 936 | else |
935 | { | 937 | { |
936 | MainLog.Instance.Warn("Sit requested on unknown object: " + targetID.ToString()); | 938 | m_log.Warn("Sit requested on unknown object: " + targetID.ToString()); |
937 | } | 939 | } |
938 | SendSitResponse(remoteClient, targetID, offset); | 940 | SendSitResponse(remoteClient, targetID, offset); |
939 | } | 941 | } |
@@ -1047,7 +1049,7 @@ namespace OpenSim.Region.Environment.Scenes | |||
1047 | } | 1049 | } |
1048 | catch | 1050 | catch |
1049 | { | 1051 | { |
1050 | MainLog.Instance.Warn("AVATAR", "SetMovementAnimation for avatar failed. Attempting recovery..."); | 1052 | m_log.Warn("[AVATAR]: SetMovementAnimation for avatar failed. Attempting recovery..."); |
1051 | m_animations[0] = anim; | 1053 | m_animations[0] = anim; |
1052 | m_animationSeqs[0] = seq; | 1054 | m_animationSeqs[0] = seq; |
1053 | SendAnimPack(); | 1055 | SendAnimPack(); |
@@ -1184,13 +1186,13 @@ namespace OpenSim.Region.Environment.Scenes | |||
1184 | //bool controlland = (((m_AgentControlFlags & (uint)AgentManager.ControlFlags.AGENT_CONTROL_UP_NEG) != 0) || ((m_AgentControlFlags & (uint)AgentManager.ControlFlags.AGENT_CONTROL_NUDGE_UP_NEG) != 0)); | 1186 | //bool controlland = (((m_AgentControlFlags & (uint)AgentManager.ControlFlags.AGENT_CONTROL_UP_NEG) != 0) || ((m_AgentControlFlags & (uint)AgentManager.ControlFlags.AGENT_CONTROL_NUDGE_UP_NEG) != 0)); |
1185 | //bool colliding = (m_physicsActor.IsColliding==true); | 1187 | //bool colliding = (m_physicsActor.IsColliding==true); |
1186 | //if (controlland) | 1188 | //if (controlland) |
1187 | // MainLog.Instance.Verbose("AGENT","landCommand"); | 1189 | // m_log.Info("[AGENT]: landCommand"); |
1188 | //if (colliding ) | 1190 | //if (colliding ) |
1189 | // MainLog.Instance.Verbose("AGENT","colliding"); | 1191 | // m_log.Info("[AGENT]: colliding"); |
1190 | //if (m_physicsActor.Flying && colliding && controlland) | 1192 | //if (m_physicsActor.Flying && colliding && controlland) |
1191 | //{ | 1193 | //{ |
1192 | // StopFlying(); | 1194 | // StopFlying(); |
1193 | // MainLog.Instance.Verbose("AGENT", "Stop FLying"); | 1195 | // m_log.Info("[AGENT]: Stop FLying"); |
1194 | //} | 1196 | //} |
1195 | } | 1197 | } |
1196 | else | 1198 | else |