aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Region/Environment/Scenes
diff options
context:
space:
mode:
Diffstat (limited to 'OpenSim/Region/Environment/Scenes')
-rw-r--r--OpenSim/Region/Environment/Scenes/ScenePresence.cs39
1 files changed, 33 insertions, 6 deletions
diff --git a/OpenSim/Region/Environment/Scenes/ScenePresence.cs b/OpenSim/Region/Environment/Scenes/ScenePresence.cs
index 75ccf1a..659a1f5 100644
--- a/OpenSim/Region/Environment/Scenes/ScenePresence.cs
+++ b/OpenSim/Region/Environment/Scenes/ScenePresence.cs
@@ -1088,17 +1088,33 @@ namespace OpenSim.Region.Environment.Scenes
1088 (m_movementflag & (uint) AgentManager.ControlFlags.AGENT_CONTROL_UP_POS) != 0) 1088 (m_movementflag & (uint) AgentManager.ControlFlags.AGENT_CONTROL_UP_POS) != 0)
1089 { 1089 {
1090 // Client is moving, and colliding and pressing the page up button but isn't flying 1090 // Client is moving, and colliding and pressing the page up button but isn't flying
1091 SetMovementAnimation(Animations.AnimsLLUUID["JUMP"], 1); 1091 try
1092 {
1093 SetMovementAnimation(Animations.AnimsLLUUID["JUMP"], 1);
1094 }
1095 catch (KeyNotFoundException)
1096 { }
1092 } 1097 }
1093 else if (m_setAlwaysRun) 1098 else if (m_setAlwaysRun)
1094 { 1099 {
1095 // We are running 1100 // We are running
1096 SetMovementAnimation(Animations.AnimsLLUUID["RUN"], 1); 1101 try
1102 {
1103 SetMovementAnimation(Animations.AnimsLLUUID["RUN"], 1);
1104 }
1105 catch (KeyNotFoundException)
1106 { }
1097 } 1107 }
1098 else 1108 else
1099 { 1109 {
1100 // We're moving, but we're not doing anything else.. so play the stand animation 1110 // We're moving, but we're not doing anything else.. so play the stand animation
1101 SetMovementAnimation(Animations.AnimsLLUUID["WALK"], 1); 1111 try
1112 {
1113 SetMovementAnimation(Animations.AnimsLLUUID["WALK"], 1);
1114 }
1115 catch (KeyNotFoundException)
1116 { }
1117
1102 } 1118 }
1103 } 1119 }
1104 else 1120 else
@@ -1130,7 +1146,13 @@ namespace OpenSim.Region.Environment.Scenes
1130 else 1146 else
1131 { 1147 {
1132 // We're not moving.. and we're not doing anything.. so play the stand animation 1148 // We're not moving.. and we're not doing anything.. so play the stand animation
1133 SetMovementAnimation(Animations.AnimsLLUUID["STAND"], 1); 1149 try
1150 {
1151
1152 SetMovementAnimation(Animations.AnimsLLUUID["STAND"], 1);
1153 }
1154 catch (KeyNotFoundException)
1155 { }
1134 } 1156 }
1135 } 1157 }
1136 } 1158 }
@@ -1181,8 +1203,13 @@ namespace OpenSim.Region.Environment.Scenes
1181 direc.z *= 3; 1203 direc.z *= 3;
1182 //System.Console.WriteLine("Jump"); 1204 //System.Console.WriteLine("Jump");
1183 // PreJump and jump happen too quickly. Many times prejump gets ignored. 1205 // PreJump and jump happen too quickly. Many times prejump gets ignored.
1184 SetMovementAnimation(Animations.AnimsLLUUID["PREJUMP"], 1); 1206 try
1185 SetMovementAnimation(Animations.AnimsLLUUID["JUMP"], 1); 1207 {
1208 SetMovementAnimation(Animations.AnimsLLUUID["PREJUMP"], 1);
1209 SetMovementAnimation(Animations.AnimsLLUUID["JUMP"], 1);
1210 }
1211 catch (KeyNotFoundException)
1212 { }
1186 } 1213 }
1187 } 1214 }
1188 } 1215 }