From 53b4551b58bc948cd6ab1926ce5d240d409266be Mon Sep 17 00:00:00 2001
From: Melanie
Date: Thu, 22 Mar 2012 20:48:31 +0000
Subject: Fix merge issue from core

---
 OpenSim/Region/ScriptEngine/Shared/Api/Implementation/LSL_Api.cs | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/OpenSim/Region/ScriptEngine/Shared/Api/Implementation/LSL_Api.cs b/OpenSim/Region/ScriptEngine/Shared/Api/Implementation/LSL_Api.cs
index bd4c5fc..4d7c40e 100644
--- a/OpenSim/Region/ScriptEngine/Shared/Api/Implementation/LSL_Api.cs
+++ b/OpenSim/Region/ScriptEngine/Shared/Api/Implementation/LSL_Api.cs
@@ -8408,7 +8408,7 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api
                 LSL_Vector lower;
                 LSL_Vector upper;
                 if (presence.Animator.Animations.DefaultAnimation.AnimID 
-                    == AnimationSet.Animations.AnimsUUID["SIT_GROUND_CONSTRAINED"])
+                    == DefaultAvatarAnimations.AnimsUUID["SIT_GROUND_CONSTRAINED"])
                 {
                     // This is for ground sitting avatars
                     float height = presence.Appearance.AvatarHeight / 2.66666667f;
-- 
cgit v1.1