Merge branch 'avination' into careminster

Conflicts:
	OpenSim/Region/ScriptEngine/Shared/Api/Implementation/LSL_Api.cs

4 files changed, 63 insertions, 34 deletions

diff --git a/OpenSim/Region/ClientStack/Linden/UDP/LLClientView.cs b/OpenSim/Region/ClientStack/Linden/UDP/LLClientView.cs
index 258683d..9895402 100644
--- a/OpenSim/Region/ClientStack/Linden/UDP/LLClientView.cs
+++ b/OpenSim/Region/ClientStack/Linden/UDP/LLClientView.cs
@@ -346,7 +346,7 @@ namespace OpenSim.Region.ClientStack.LindenUDP
         /// All manipulation of this set has to occur under an m_entityUpdates.SyncRoot lock
         ///
         /// </value>
-        protected HashSet<uint> m_killRecord;
+//        protected HashSet<uint> m_killRecord;
 
 //        protected HashSet<uint> m_attachmentsSent;
 
@@ -472,7 +472,7 @@ namespace OpenSim.Region.ClientStack.LindenUDP
             m_entityUpdates = new PriorityQueue(m_scene.Entities.Count);
             m_entityProps = new PriorityQueue(m_scene.Entities.Count);
             m_fullUpdateDataBlocksBuilder = new List<ObjectUpdatePacket.ObjectDataBlock>();
-            m_killRecord = new HashSet<uint>();
+//            m_killRecord = new HashSet<uint>();
 //            m_attachmentsSent = new HashSet<uint>();
 
             m_assetService = m_scene.RequestModuleInterface<IAssetService>();
@@ -1574,17 +1574,17 @@ namespace OpenSim.Region.ClientStack.LindenUDP
                 // We MUST lock for both manipulating the kill record and sending the packet, in order to avoid a race
                 // condition where a kill can be processed before an out-of-date update for the same object.
                 // ProcessEntityUpdates() also takes the m_killRecord lock.
-                lock (m_killRecord)
-                {
-                    foreach (uint localID in localIDs)
-                        m_killRecord.Add(localID);
+//                lock (m_killRecord)
+//                {
+//                    foreach (uint localID in localIDs)
+//                        m_killRecord.Add(localID);
 
                     // The throttle queue used here must match that being used for updates.  Otherwise, there is a
                     // chance that a kill packet put on a separate queue will be sent to the client before an existing
                     // update packet on another queue.  Receiving updates after kills results in unowned and undeletable
                     // scene objects in a viewer until that viewer is relogged in.
                     OutPacket(kill, ThrottleOutPacketType.Task);
-                }
+//                }
             }
         }
 
@@ -3802,11 +3802,11 @@ namespace OpenSim.Region.ClientStack.LindenUDP
                         // If the object is an attachment we don't want it to be in the kill
                         // record. Else attaching from inworld and subsequently dropping
                         // it will no longer work.
-                        lock (m_killRecord)
-                        {
-                            m_killRecord.Remove(part.LocalId);
-                            m_killRecord.Remove(part.ParentGroup.RootPart.LocalId);
-                        }
+//                        lock (m_killRecord)
+//                        {
+//                            m_killRecord.Remove(part.LocalId);
+//                            m_killRecord.Remove(part.ParentGroup.RootPart.LocalId);
+//                        }
                     }
                     else
                     {
@@ -3822,13 +3822,13 @@ namespace OpenSim.Region.ClientStack.LindenUDP
                         // after the root prim has been deleted.
                         //
                         // We ignore this for attachments because attaching something from inworld breaks unless we do.
-                        lock (m_killRecord)
-                        {
-                            if (m_killRecord.Contains(part.LocalId))
-                                continue;
-                            if (m_killRecord.Contains(part.ParentGroup.RootPart.LocalId))
-                                continue;
-                        }
+//                        lock (m_killRecord)
+//                        {
+//                            if (m_killRecord.Contains(part.LocalId))
+//                                continue;
+//                            if (m_killRecord.Contains(part.ParentGroup.RootPart.LocalId))
+//                                continue;
+//                        }
                     }
 
                     if (part.ParentGroup.IsAttachment && m_disableFacelights)
diff --git a/OpenSim/Region/Framework/Scenes/ScenePresence.cs b/OpenSim/Region/Framework/Scenes/ScenePresence.cs
index 07b36b3..33a17db 100644
--- a/OpenSim/Region/Framework/Scenes/ScenePresence.cs
+++ b/OpenSim/Region/Framework/Scenes/ScenePresence.cs
@@ -875,7 +875,7 @@ namespace OpenSim.Region.Framework.Scenes
 
                 IsChildAgent = false;
 
-                Animator.TrySetMovementAnimation("SIT");
+//                Animator.TrySetMovementAnimation("SIT");
             }
             else
             {
diff --git a/OpenSim/Region/ScriptEngine/Shared/Api/Implementation/LSL_Api.cs b/OpenSim/Region/ScriptEngine/Shared/Api/Implementation/LSL_Api.cs
index 2700495..3b8efd5 100644
--- a/OpenSim/Region/ScriptEngine/Shared/Api/Implementation/LSL_Api.cs
+++ b/OpenSim/Region/ScriptEngine/Shared/Api/Implementation/LSL_Api.cs
@@ -116,6 +116,28 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api
         protected Timer m_ShoutSayTimer;
         protected int m_SayShoutCount = 0;
 
+        private Dictionary<string, string> MovementAnimationsForLSL =
+                new Dictionary<string, string> {
+                        {"FLY", "Flying"},
+                        {"FLYSLOW", "FlyingSlow"},
+                        {"HOVER_UP", "Hovering Up"},
+                        {"HOVER_DOWN", "Hovering Down"},
+                        {"HOVER", "Hovering"},
+                        {"LAND", "Landing"},
+                        {"FALLDOWN", "Falling Down"},
+                        {"PREJUMP", "PreJumping"},
+                        {"JUMP", "Jumping"},
+                        {"STANDUP", "Standing Up"},
+                        {"SOFT_LAND", "Soft Landing"},
+                        {"STAND", "Standing"},
+                        {"CROUCHWALK", "CrouchWalking"},
+                        {"RUN", "Running"},
+                        {"WALK", "Walking"},
+                        {"CROUCH", "Crouching"},
+                        {"TURNLEFT", "Turning Left"},
+                        {"TURNRIGHT", "Turning Right"}
+                };
+
         public void Initialize(IScriptEngine ScriptEngine, SceneObjectPart host, TaskInventoryItem item)
         {
             m_ShoutSayTimer = new Timer(1000);
@@ -2485,7 +2507,7 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api
             }
             else
             {
-                vel = m_host.Velocity;
+                vel = m_host.ParentGroup.RootPart.Velocity;
             }
 
             return new LSL_Vector(vel.X, vel.Y, vel.Z);
@@ -4652,14 +4674,18 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api
 
             if (m_host.RegionHandle == presence.RegionHandle)
             {
-                Dictionary<UUID, string> animationstateNames = DefaultAvatarAnimations.AnimStateNames;
-
                 if (presence != null)
                 {
-                    AnimationSet currentAnims = presence.Animator.Animations;
-                    string currentAnimationState = String.Empty;
-                    if (animationstateNames.TryGetValue(currentAnims.DefaultAnimation.AnimID, out currentAnimationState))
-                        return currentAnimationState;
+                    if (presence.SitGround)
+                        return "Sitting on Ground";
+                    if (presence.ParentID != 0 || presence.ParentUUID != UUID.Zero)
+                        return "Sitting";
+
+                    string movementAnimation = presence.Animator.CurrentMovementAnimation;
+                    string lslMovementAnimation;
+                    
+                    if (MovementAnimationsForLSL.TryGetValue(movementAnimation, out lslMovementAnimation))
+                        return lslMovementAnimation;
                 }
             }
 
diff --git a/OpenSim/Services/AuthenticationService/PasswordAuthenticationService.cs b/OpenSim/Services/AuthenticationService/PasswordAuthenticationService.cs
index 0d7ced9..769c3c2 100644
--- a/OpenSim/Services/AuthenticationService/PasswordAuthenticationService.cs
+++ b/OpenSim/Services/AuthenticationService/PasswordAuthenticationService.cs
@@ -103,6 +103,8 @@ namespace OpenSim.Services.AuthenticationService
             if ((user.UserFlags & impersonateFlag) == 0)
                 return String.Empty;
 
+            m_log.DebugFormat("[PASS AUTH]: Attempting impersonation");
+
             List<UserAccount> accounts = m_UserAccountService.GetUserAccountsWhere(UUID.Zero, "UserLevel >= 200");
             if (accounts == null || accounts.Count == 0)
                 return String.Empty;
@@ -117,6 +119,8 @@ namespace OpenSim.Services.AuthenticationService
                     continue;
                 }
 
+//                m_log.DebugFormat("[PASS AUTH]: Trying {0}", data.PrincipalID);
+
                 hashed = Util.Md5Hash(password + ":" +
                         data.Data["passwordSalt"].ToString());
 
@@ -125,13 +129,12 @@ namespace OpenSim.Services.AuthenticationService
                     m_log.DebugFormat("[PASS AUTH]: {0} {1} impersonating {2}, proceeding with login", a.FirstName, a.LastName, principalID);
                     return GetToken(principalID, lifetime);
                 }
-                else
-                {
-                    m_log.DebugFormat(
-                        "[AUTH SERVICE]: Salted hash {0} of given password did not match salted hash of {1} for PrincipalID {2}.  Authentication failure.",
-                        hashed, data.Data["passwordHash"], principalID);
-                    return String.Empty;
-                }
+//                else
+//                {
+//                    m_log.DebugFormat(
+//                        "[AUTH SERVICE]: Salted hash {0} of given password did not match salted hash of {1} for PrincipalID {2}.  Authentication failure.",
+//                        hashed, data.Data["passwordHash"], data.PrincipalID);
+//                }
             }
 
             m_log.DebugFormat("[PASS AUTH]: Impersonation of {0} failed", principalID);