Merge branch 'master' into casper

2 files changed, 66 insertions, 1 deletions

diff --git a/OpenSim/Region/Framework/Scenes/SceneGraph.cs b/OpenSim/Region/Framework/Scenes/SceneGraph.cs
index b0fb8b3..998d598 100644
--- a/OpenSim/Region/Framework/Scenes/SceneGraph.cs
+++ b/OpenSim/Region/Framework/Scenes/SceneGraph.cs
@@ -222,6 +222,30 @@ namespace OpenSim.Region.Framework.Scenes
         protected internal bool AddRestoredSceneObject(
             SceneObjectGroup sceneObject, bool attachToBackup, bool alreadyPersisted)
         {
+                // KF: Check for out-of-region, move inside and make static.
+                        Vector3 npos = new Vector3(sceneObject.RootPart.GroupPosition.X,
+                                                           sceneObject.RootPart.GroupPosition.Y,
+                                                           sceneObject.RootPart.GroupPosition.Z);
+                        if (npos.X < 0.0 || npos.Y < 0.0 || npos.Z < 0.0 ||
+                            npos.X > Constants.RegionSize ||
+                            npos.Y > Constants.RegionSize)
+                        {
+                                if (npos.X < 0.0) npos.X = 1.0f;
+                                if (npos.Y < 0.0) npos.Y = 1.0f;
+                                if (npos.Z < 0.0) npos.Z = 0.0f;
+                                if (npos.X > Constants.RegionSize) npos.X = Constants.RegionSize - 1.0f;
+                                if (npos.Y > Constants.RegionSize) npos.Y = Constants.RegionSize - 1.0f;
+ 
+                foreach (SceneObjectPart part in sceneObject.Children.Values)
+                {
+                        part.GroupPosition = npos;
+                }
+                sceneObject.RootPart.Velocity = Vector3.Zero;
+                sceneObject.RootPart.AngularVelocity = Vector3.Zero;
+                sceneObject.RootPart.Acceleration = Vector3.Zero;
+                sceneObject.RootPart.Velocity = Vector3.Zero;
+                        }
+                        
             if (!alreadyPersisted)
             {
                 sceneObject.ForceInventoryPersistence();
diff --git a/OpenSim/Region/Framework/Scenes/UuidGatherer.cs b/OpenSim/Region/Framework/Scenes/UuidGatherer.cs
index 930af81..3edb677 100644
--- a/OpenSim/Region/Framework/Scenes/UuidGatherer.cs
+++ b/OpenSim/Region/Framework/Scenes/UuidGatherer.cs
@@ -27,6 +27,7 @@
 
 using System;
 using System.Collections.Generic;
+using System.IO;
 using System.Reflection;
 using System.Text.RegularExpressions;
 using System.Threading;
@@ -91,6 +92,10 @@ namespace OpenSim.Region.Framework.Scenes
             {
                 GetWearableAssetUuids(assetUuid, assetUuids);
             }
+            else if (AssetType.Gesture == assetType)
+            {
+                GetGestureAssetUuids(assetUuid, assetUuids);
+            }
             else if (AssetType.LSLText == assetType)
             {
                 GetScriptAssetUuids(assetUuid, assetUuids);
@@ -278,5 +283,41 @@ namespace OpenSim.Region.Framework.Scenes
                     GatherAssetUuids(sog, assetUuids);
             }
         }
+
+        protected void GetGestureAssetUuids(UUID gestureUuid, IDictionary<UUID, int> assetUuids)
+        {
+            AssetBase assetBase = GetAsset(gestureUuid);
+
+            MemoryStream ms = new MemoryStream(assetBase.Data);
+            StreamReader sr = new StreamReader(ms);
+
+            sr.ReadLine(); // Unknown (Version?)
+            sr.ReadLine(); // Unknown
+            sr.ReadLine(); // Unknown
+            sr.ReadLine(); // Name
+            sr.ReadLine(); // Comment ?
+            int count = Convert.ToInt32(sr.ReadLine()); // Item count
+
+            for (int i = 0 ; i < count ; i++)
+            {
+                string type = sr.ReadLine();
+                if (type == null)
+                    break;
+                string name = sr.ReadLine();
+                if (name == null)
+                    break;
+                string id = sr.ReadLine();
+                if (id == null)
+                    break;
+                string unknown = sr.ReadLine();
+                if (unknown == null)
+                    break;
+
+                // If it can be parsed as a UUID, it is an asset ID
+                UUID uuid;
+                if (UUID.TryParse(id, out uuid))
+                    assetUuids[uuid] = 1;
+            }
+        }
     }
-}
\ No newline at end of file
+}