2 files changed, 21 insertions, 12 deletions

diff --git a/OpenSim/Framework/DAMap.cs b/OpenSim/Framework/DAMap.cs
index 291c8b8..24e0895 100644
--- a/OpenSim/Framework/DAMap.cs
+++ b/OpenSim/Framework/DAMap.cs
@@ -168,6 +168,10 @@ namespace OpenSim.Framework
             }
         }
 
+        /// <summary>
+        /// Validate the key used for storing separate data stores.
+        /// </summary>
+        /// <param name='key'></param>
         private static void ValidateKey(string key)
         {
             if (key.Length < MIN_STORE_NAME_LENGTH)
@@ -188,7 +192,8 @@ namespace OpenSim.Framework
         }    
 
         public void Add(KeyValuePair<string, OSDMap> kvp) 
-        {    
+        {   
+            ValidateKey(kvp.Key);
             lock (this)
                 m_map.Add(kvp.Key, kvp.Value);
         }    
diff --git a/OpenSim/Region/Framework/Scenes/Scripting/IScriptHost.cs b/OpenSim/Framework/ExtraPhysicsData.cs
index f3be028..9e7334f 100644
--- a/OpenSim/Region/Framework/Scenes/Scripting/IScriptHost.cs
+++ b/OpenSim/Framework/ExtraPhysicsData.cs
@@ -27,20 +27,24 @@
 
 using OpenMetaverse;
 
-namespace OpenSim.Region.Framework.Scenes.Scripting
+namespace OpenSim.Framework
 {
-    public interface IScriptHost
+    public enum PhysShapeType : byte
     {
-        string Name { get; set; }
-        string Description { get; set; }
+        prim = 0,
+        none = 1,
+        convex = 2,
 
-        UUID UUID { get; }
-        UUID OwnerID { get; }
-        UUID CreatorID { get; }
-        Vector3 AbsolutePosition { get; }
+        invalid = 255 // use to mark invalid data in ExtraPhysicsData
+    }
+
+    public struct ExtraPhysicsData
+    {
+        public float Density;
+        public float GravitationModifier;
+        public float Friction;
+        public float Bounce;
+        public PhysShapeType PhysShapeType;
 
-        string SitName { get; set; }
-        string TouchName { get; set; }
-        void SetText(string text, Vector3 color, double alpha);
     }
 }