aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Region/Environment/Scenes/ScenePresence.cs
diff options
context:
space:
mode:
Diffstat (limited to '')
-rw-r--r--OpenSim/Region/Environment/Scenes/ScenePresence.cs34
1 files changed, 17 insertions, 17 deletions
diff --git a/OpenSim/Region/Environment/Scenes/ScenePresence.cs b/OpenSim/Region/Environment/Scenes/ScenePresence.cs
index c74cac3..f391cb5 100644
--- a/OpenSim/Region/Environment/Scenes/ScenePresence.cs
+++ b/OpenSim/Region/Environment/Scenes/ScenePresence.cs
@@ -616,7 +616,7 @@ namespace OpenSim.Region.Environment.Scenes
616 /// </summary> 616 /// </summary>
617 public void MakeChildAgent() 617 public void MakeChildAgent()
618 { 618 {
619 if(m_animations.Count > 0) 619 if (m_animations.Count > 0)
620 { 620 {
621 LLUUID movement=m_animations[0]; 621 LLUUID movement=m_animations[0];
622 622
@@ -1110,11 +1110,11 @@ namespace OpenSim.Region.Environment.Scenes
1110 1110
1111 public void AddAnimation(LLUUID animID) 1111 public void AddAnimation(LLUUID animID)
1112 { 1112 {
1113 if(m_isChildAgent) 1113 if (m_isChildAgent)
1114 return; 1114 return;
1115 1115
1116 // Don't let this animation become the movement animation 1116 // Don't let this animation become the movement animation
1117 if(m_animations.Count < 1) 1117 if (m_animations.Count < 1)
1118 SetMovementAnimation(Animations.AnimsLLUUID["STAND"]); 1118 SetMovementAnimation(Animations.AnimsLLUUID["STAND"]);
1119 1119
1120 if (!m_animations.Contains(animID)) 1120 if (!m_animations.Contains(animID))
@@ -1127,7 +1127,7 @@ namespace OpenSim.Region.Environment.Scenes
1127 1127
1128 public void RemoveAnimation(LLUUID animID) 1128 public void RemoveAnimation(LLUUID animID)
1129 { 1129 {
1130 if(m_isChildAgent) 1130 if (m_isChildAgent)
1131 return; 1131 return;
1132 1132
1133 if (m_animations.Contains(animID)) 1133 if (m_animations.Contains(animID))
@@ -1143,7 +1143,7 @@ namespace OpenSim.Region.Environment.Scenes
1143 1143
1144 for(idx=0;idx < m_animations.Count;idx++) 1144 for(idx=0;idx < m_animations.Count;idx++)
1145 { 1145 {
1146 if(m_animations[idx] == animID) 1146 if (m_animations[idx] == animID)
1147 { 1147 {
1148 int seq=m_animationSeqs[idx]; 1148 int seq=m_animationSeqs[idx];
1149 1149
@@ -1158,16 +1158,16 @@ namespace OpenSim.Region.Environment.Scenes
1158 } 1158 }
1159 public void AddAnimation(string name) 1159 public void AddAnimation(string name)
1160 { 1160 {
1161 if(m_isChildAgent) 1161 if (m_isChildAgent)
1162 return; 1162 return;
1163 1163
1164 // Don't let this animation become the movement animation 1164 // Don't let this animation become the movement animation
1165 if(m_animations.Count < 1) 1165 if (m_animations.Count < 1)
1166 SetMovementAnimation(Animations.AnimsLLUUID["STAND"]); 1166 SetMovementAnimation(Animations.AnimsLLUUID["STAND"]);
1167 1167
1168 LLUUID animID=m_controllingClient.GetDefaultAnimation(name); 1168 LLUUID animID=m_controllingClient.GetDefaultAnimation(name);
1169 if(animID == LLUUID.Zero) 1169 if (animID == LLUUID.Zero)
1170 return; 1170 return;
1171 1171
1172 if (!m_animations.Contains(animID)) 1172 if (!m_animations.Contains(animID))
1173 { 1173 {
@@ -1179,12 +1179,12 @@ namespace OpenSim.Region.Environment.Scenes
1179 1179
1180 public void RemoveAnimation(string name) 1180 public void RemoveAnimation(string name)
1181 { 1181 {
1182 if(m_isChildAgent) 1182 if (m_isChildAgent)
1183 return; 1183 return;
1184 1184
1185 LLUUID animID=m_controllingClient.GetDefaultAnimation(name); 1185 LLUUID animID=m_controllingClient.GetDefaultAnimation(name);
1186 if(animID == LLUUID.Zero) 1186 if (animID == LLUUID.Zero)
1187 return; 1187 return;
1188 1188
1189 if (m_animations.Contains(animID)) 1189 if (m_animations.Contains(animID))
1190 { 1190 {
@@ -1199,7 +1199,7 @@ namespace OpenSim.Region.Environment.Scenes
1199 1199
1200 for(idx=0;idx < m_animations.Count;idx++) 1200 for(idx=0;idx < m_animations.Count;idx++)
1201 { 1201 {
1202 if(m_animations[idx] == animID) 1202 if (m_animations[idx] == animID)
1203 { 1203 {
1204 int seq=m_animationSeqs[idx]; 1204 int seq=m_animationSeqs[idx];
1205 1205
@@ -1231,7 +1231,7 @@ namespace OpenSim.Region.Environment.Scenes
1231 /// </summary> 1231 /// </summary>
1232 protected void SetMovementAnimation(LLUUID anim) 1232 protected void SetMovementAnimation(LLUUID anim)
1233 { 1233 {
1234 if(m_animations.Count < 1) 1234 if (m_animations.Count < 1)
1235 { 1235 {
1236 m_animations.Add(Animations.AnimsLLUUID["STAND"]); 1236 m_animations.Add(Animations.AnimsLLUUID["STAND"]);
1237 m_animationSeqs.Add(1); 1237 m_animationSeqs.Add(1);
@@ -1649,7 +1649,7 @@ namespace OpenSim.Region.Environment.Scenes
1649 /// <param name="seqs"></param> 1649 /// <param name="seqs"></param>
1650 public void SendAnimPack(LLUUID[] animations, int[] seqs) 1650 public void SendAnimPack(LLUUID[] animations, int[] seqs)
1651 { 1651 {
1652 if(m_isChildAgent) 1652 if (m_isChildAgent)
1653 return; 1653 return;
1654 1654
1655 m_scene.Broadcast( 1655 m_scene.Broadcast(