Merge branch 'master' into careminster

Conflicts:
	OpenSim/Data/MySQL/MySQLSimulationData.cs
	OpenSim/Framework/Servers/VersionInfo.cs
	OpenSim/Region/ClientStack/Linden/Caps/BunchOfCaps/BunchOfCaps.cs
	OpenSim/Region/Framework/Scenes/SceneObjectPart.cs

OpenSim/ApplicationPlugins/LoadRegions/Properties/AssemblyInfo.cs

@@ -60,7 +60,7 @@ using System.Runtime.InteropServices;
 //
 // You can specify all the values or you can default the Build and Revision Numbers
 // by using the '*' as shown below:
-// [assembly: AssemblyVersion("0.7.5.*")]
+// [assembly: AssemblyVersion("0.7.6.*")]
 
-[assembly : AssemblyVersion("0.7.5.*")]
+[assembly : AssemblyVersion("0.7.6.*")]
 [assembly : AssemblyFileVersion("0.6.5.0")]

OpenSim/ApplicationPlugins/RegionModulesController/Properties/AssemblyInfo.cs

@@ -29,5 +29,5 @@ using System.Runtime.InteropServices;
 //      Build Number
 //      Revision
 //
-[assembly: AssemblyVersion("0.7.5.*")]
+[assembly: AssemblyVersion("0.7.6.*")]
 [assembly: AssemblyFileVersion("1.0.0.0")]

OpenSim/ApplicationPlugins/RemoteController/Properties/AssemblyInfo.cs

@@ -29,5 +29,5 @@ using System.Runtime.InteropServices;
 //      Build Number
 //      Revision
 //
-[assembly: AssemblyVersion("0.7.5.*")]
+[assembly: AssemblyVersion("0.7.6.*")]
 [assembly: AssemblyFileVersion("1.0.0.0")]

OpenSim/Capabilities/Handlers/Properties/AssemblyInfo.cs

@@ -29,5 +29,5 @@ using System.Runtime.InteropServices;
 //      Build Number
 //      Revision
 //
-[assembly: AssemblyVersion("0.7.5.*")]
+[assembly: AssemblyVersion("0.7.6.*")]
 [assembly: AssemblyFileVersion("1.0.0.0")]

OpenSim/Capabilities/Properties/AssemblyInfo.cs

@@ -29,5 +29,5 @@ using System.Runtime.InteropServices;
 //      Build Number
 //      Revision
 //
-[assembly: AssemblyVersion("0.7.5.*")]
+[assembly: AssemblyVersion("0.7.6.*")]
 [assembly: AssemblyFileVersion("1.0.0.0")]

OpenSim/ConsoleClient/Properties/AssemblyInfo.cs

@@ -29,5 +29,5 @@ using System.Runtime.InteropServices;
 //      Build Number
 //      Revision
 //
-[assembly: AssemblyVersion("0.7.5.*")]
+[assembly: AssemblyVersion("0.7.6.*")]
 [assembly: AssemblyFileVersion("1.0.0.0")]

OpenSim/Data/MSSQL/MSSQLSimulationData.cs

@@ -351,7 +351,7 @@ IF EXISTS (SELECT UUID FROM prims WHERE UUID = @UUID)
             ScriptAccessPin = @ScriptAccessPin, AllowedDrop = @AllowedDrop, DieAtEdge = @DieAtEdge, SalePrice = @SalePrice, 
             SaleType = @SaleType, ColorR = @ColorR, ColorG = @ColorG, ColorB = @ColorB, ColorA = @ColorA, ParticleSystem = @ParticleSystem, 
             ClickAction = @ClickAction, Material = @Material, CollisionSound = @CollisionSound, CollisionSoundVolume = @CollisionSoundVolume, PassTouches = @PassTouches,
-            LinkNumber = @LinkNumber, MediaURL = @MediaURL
+            LinkNumber = @LinkNumber, MediaURL = @MediaURL, DynAttrs = @DynAttrs
         WHERE UUID = @UUID
     END
 ELSE
@@ -366,7 +366,7 @@ ELSE
             PayPrice, PayButton1, PayButton2, PayButton3, PayButton4, LoopedSound, LoopedSoundGain, TextureAnimation, OmegaX, 
             OmegaY, OmegaZ, CameraEyeOffsetX, CameraEyeOffsetY, CameraEyeOffsetZ, CameraAtOffsetX, CameraAtOffsetY, CameraAtOffsetZ, 
             ForceMouselook, ScriptAccessPin, AllowedDrop, DieAtEdge, SalePrice, SaleType, ColorR, ColorG, ColorB, ColorA, 
-            ParticleSystem, ClickAction, Material, CollisionSound, CollisionSoundVolume, PassTouches, LinkNumber, MediaURL
+            ParticleSystem, ClickAction, Material, CollisionSound, CollisionSoundVolume, PassTouches, LinkNumber, MediaURL, DynAttrs
             ) VALUES (
             @UUID, @CreationDate, @Name, @Text, @Description, @SitName, @TouchName, @ObjectFlags, @OwnerMask, @NextOwnerMask, @GroupMask, 
             @EveryoneMask, @BaseMask, @PositionX, @PositionY, @PositionZ, @GroupPositionX, @GroupPositionY, @GroupPositionZ, @VelocityX, 
@@ -376,7 +376,7 @@ ELSE
             @PayPrice, @PayButton1, @PayButton2, @PayButton3, @PayButton4, @LoopedSound, @LoopedSoundGain, @TextureAnimation, @OmegaX, 
             @OmegaY, @OmegaZ, @CameraEyeOffsetX, @CameraEyeOffsetY, @CameraEyeOffsetZ, @CameraAtOffsetX, @CameraAtOffsetY, @CameraAtOffsetZ, 
             @ForceMouselook, @ScriptAccessPin, @AllowedDrop, @DieAtEdge, @SalePrice, @SaleType, @ColorR, @ColorG, @ColorB, @ColorA, 
-            @ParticleSystem, @ClickAction, @Material, @CollisionSound, @CollisionSoundVolume, @PassTouches, @LinkNumber, @MediaURL
+            @ParticleSystem, @ClickAction, @Material, @CollisionSound, @CollisionSoundVolume, @PassTouches, @LinkNumber, @MediaURL, @DynAttrs
             )
     END";
 
@@ -1691,6 +1691,11 @@ VALUES
 
             if (!(primRow["MediaURL"] is System.DBNull))
                 prim.MediaUrl = (string)primRow["MediaURL"];
+            
+            if (!(primRow["DynAttrs"] is System.DBNull))
+                prim.DynAttrs = DAMap.FromXml((string)primRow["DynAttrs"]);
+            else
+                prim.DynAttrs = new DAMap();             
 
             return prim;
         }
@@ -1749,7 +1754,6 @@ VALUES
                 baseShape.Media = PrimitiveBaseShape.MediaList.FromXml((string)shapeRow["Media"]);
             }
 
-
             return baseShape;
         }
 
@@ -2086,6 +2090,11 @@ VALUES
                 parameters.Add(_Database.CreateParameter("PassTouches", 0));
             parameters.Add(_Database.CreateParameter("LinkNumber", prim.LinkNum));
             parameters.Add(_Database.CreateParameter("MediaURL", prim.MediaUrl));
+            
+            if (prim.DynAttrs.Count > 0)
+                parameters.Add(_Database.CreateParameter("DynAttrs", prim.DynAttrs.ToXml()));
+            else
+                parameters.Add(_Database.CreateParameter("DynAttrs", null));
 
             return parameters.ToArray();
         }
@@ -2143,7 +2152,6 @@ VALUES
                 parameters.Add(_Database.CreateParameter("Media", s.Media.ToXml()));
             }
 
-
             return parameters.ToArray();
         }
 

OpenSim/Data/MSSQL/Properties/AssemblyInfo.cs

@@ -61,5 +61,5 @@ using System.Runtime.InteropServices;
 // You can specify all the values or you can default the Revision and Build Numbers
 // by using the '*' as shown below:
 
-[assembly : AssemblyVersion("0.7.5.*")]
+[assembly : AssemblyVersion("0.7.6.*")]
 [assembly : AssemblyFileVersion("0.6.5.0")]

OpenSim/Data/MSSQL/Resources/RegionStore.migrations

@@ -1148,3 +1148,11 @@ CREATE TABLE [dbo].[regionenvironment](
 ) ON [PRIMARY]
 
 COMMIT
+
+:VERSION 38       #---------------- Dynamic attributes
+
+BEGIN TRANSACTION
+
+ALTER TABLE prims ADD COLUMN DynAttrs TEXT;
+
+COMMIT

OpenSim/Data/MySQL/MySQLSimulationData.cs

@@ -176,7 +176,7 @@ namespace OpenSim.Data.MySQL
                                     "PassCollisions, " +
                                     "LinkNumber, MediaURL, KeyframeMotion, " +
                                     "PhysicsShapeType, Density, GravityModifier, " +
-                                    "Friction, Restitution, Vehicle " +
+                                    "Friction, Restitution, Vehicle, DynAttrs " +
                                     ") values (" + "?UUID, " +
                                     "?CreationDate, ?Name, ?Text, " +
                                     "?Description, ?SitName, ?TouchName, " +
@@ -211,7 +211,7 @@ namespace OpenSim.Data.MySQL
                                     "?CollisionSoundVolume, ?PassTouches, ?PassCollisions, " +
                                     "?LinkNumber, ?MediaURL, ?KeyframeMotion, " +
                                     "?PhysicsShapeType, ?Density, ?GravityModifier, " +
-                                    "?Friction, ?Restitution, ?Vehicle)";
+                                    "?Friction, ?Restitution, ?Vehicle, ?DynAttrs)";
 
                             FillPrimCommand(cmd, prim, obj.UUID, regionUUID);
 
@@ -228,7 +228,8 @@ namespace OpenSim.Data.MySQL
                                     "PathTaperX, PathTaperY, PathTwist, " +
                                     "PathTwistBegin, ProfileBegin, ProfileEnd, " +
                                     "ProfileCurve, ProfileHollow, Texture, " +
-                                    "ExtraParams, State, Media) values (?UUID, " +
+                                    "ExtraParams, State, Media) " +
+                                    "values (?UUID, " +
                                     "?Shape, ?ScaleX, ?ScaleY, ?ScaleZ, " +
                                     "?PCode, ?PathBegin, ?PathEnd, " +
                                     "?PathScaleX, ?PathScaleY, " +
@@ -1321,6 +1322,11 @@ namespace OpenSim.Data.MySQL
             
             if (!(row["MediaURL"] is System.DBNull))
                 prim.MediaUrl = (string)row["MediaURL"];
+            
+            if (!(row["DynAttrs"] is System.DBNull))
+                prim.DynAttrs = DAMap.FromXml((string)row["DynAttrs"]);
+            else
+                prim.DynAttrs = new DAMap();        
 
             if (!(row["KeyframeMotion"] is DBNull))
             {
@@ -1731,6 +1737,11 @@ namespace OpenSim.Data.MySQL
                 cmd.Parameters.AddWithValue("Vehicle", prim.VehicleParams.ToXml2());
             else
                 cmd.Parameters.AddWithValue("Vehicle", String.Empty);
+
+            if (prim.DynAttrs.Count > 0)
+                cmd.Parameters.AddWithValue("DynAttrs", prim.DynAttrs.ToXml());
+            else
+                cmd.Parameters.AddWithValue("DynAttrs", null);
         }
 
         /// <summary>

OpenSim/Data/MySQL/Properties/AssemblyInfo.cs

@@ -61,5 +61,5 @@ using System.Runtime.InteropServices;
 // You can specify all the values or you can default the Revision and Build Numbers
 // by using the '*' as shown below:
 
-[assembly : AssemblyVersion("0.7.5.*")]
+[assembly : AssemblyVersion("0.7.6.*")]
 [assembly : AssemblyFileVersion("0.6.5.0")]

OpenSim/Data/MySQL/Resources/RegionStore.migrations

@@ -902,3 +902,11 @@ BEGIN;
 CREATE TABLE `regionextra` (`RegionID` char(36) not null, `Name` varchar(32) not null, `value` text, primary key(`RegionID`, `Name`));
 
 COMMIT;
+
+:VERSION 46       #---------------- Dynamic attributes
+
+BEGIN;
+
+ALTER TABLE prims ADD COLUMN DynAttrs TEXT;
+
+COMMIT;

OpenSim/Data/Null/Properties/AssemblyInfo.cs

@@ -61,5 +61,5 @@ using System.Runtime.InteropServices;
 // You can specify all the values or you can default the Revision and Build Numbers
 // by using the '*' as shown below:
 
-[assembly : AssemblyVersion("0.7.5.*")]
+[assembly : AssemblyVersion("0.7.6.*")]
 [assembly : AssemblyFileVersion("0.6.5.0")]

OpenSim/Data/Properties/AssemblyInfo.cs

@@ -61,5 +61,5 @@ using System.Runtime.InteropServices;
 // You can specify all the values or you can default the Revision and Build Numbers
 // by using the '*' as shown below:
 
-[assembly : AssemblyVersion("0.7.5.*")]
+[assembly : AssemblyVersion("0.7.6.*")]
 [assembly : AssemblyFileVersion("0.6.5.0")]

OpenSim/Data/SQLite/Properties/AssemblyInfo.cs

@@ -61,5 +61,5 @@ using System.Runtime.InteropServices;
 // You can specify all the values or you can default the Revision and Build Numbers
 // by using the '*' as shown below:
 
-[assembly : AssemblyVersion("0.7.5.*")]
+[assembly : AssemblyVersion("0.7.6.*")]
 [assembly : AssemblyFileVersion("0.6.5.0")]

OpenSim/Data/SQLite/Resources/RegionStore.migrations

@@ -575,3 +575,8 @@ CREATE TABLE `regionenvironment` (
 );
 
 COMMIT;
+
+:VERSION 27
+BEGIN;
+ALTER TABLE prims ADD COLUMN DynAttrs TEXT;
+COMMIT;

OpenSim/Data/SQLite/SQLiteSimulationData.cs

@@ -1232,6 +1232,8 @@ namespace OpenSim.Data.SQLite
             createCol(prims, "VolumeDetect", typeof(Int16));
 
             createCol(prims, "MediaURL", typeof(String));
+            
+            createCol(prims, "DynAttrs", typeof(String));
 
             // Add in contraints
             prims.PrimaryKey = new DataColumn[] { prims.Columns["UUID"] };
@@ -1711,6 +1713,16 @@ namespace OpenSim.Data.SQLite
 //                m_log.DebugFormat("[SQLITE]: MediaUrl type [{0}]", row["MediaURL"].GetType());
                 prim.MediaUrl = (string)row["MediaURL"];
             }
+            
+            if (!(row["DynAttrs"] is System.DBNull))
+            {
+                //m_log.DebugFormat("[SQLITE]: DynAttrs type [{0}]", row["DynAttrs"].GetType());
+                prim.DynAttrs = DAMap.FromXml((string)row["DynAttrs"]);
+            }   
+            else
+            {
+                prim.DynAttrs = new DAMap();
+            }
 
             return prim;
         }
@@ -2133,6 +2145,11 @@ namespace OpenSim.Data.SQLite
                 row["VolumeDetect"] = 0;
 
             row["MediaURL"] = prim.MediaUrl;
+
+            if (prim.DynAttrs.Count > 0)
+                row["DynAttrs"] = prim.DynAttrs.ToXml();
+            else
+                row["DynAttrs"] = null;
         }
 
         /// <summary>
@@ -2392,7 +2409,7 @@ namespace OpenSim.Data.SQLite
 
             if (!(row["Media"] is System.DBNull))
                 s.Media = PrimitiveBaseShape.MediaList.FromXml((string)row["Media"]);
-
+                        
             return s;
         }
 

OpenSim/Framework/AssemblyInfo.cs

@@ -59,5 +59,5 @@ using System.Runtime.InteropServices;
 //      Revision
 //
 
-[assembly : AssemblyVersion("0.7.5.*")]
+[assembly : AssemblyVersion("0.7.6.*")]
 [assembly : AssemblyFileVersion("0.6.5.0")]

OpenSim/Framework/AssetLoader/Filesystem/Properties/AssemblyInfo.cs

@@ -29,5 +29,5 @@ using System.Runtime.InteropServices;
 //      Build Number
 //      Revision
 //
-[assembly: AssemblyVersion("0.7.5.*")]
+[assembly: AssemblyVersion("0.7.6.*")]
 [assembly: AssemblyFileVersion("1.0.0.0")]

OpenSim/Framework/Communications/Properties/AssemblyInfo.cs

@@ -61,5 +61,5 @@ using System.Runtime.InteropServices;
 // You can specify all the values or you can default the Revision and Build Numbers
 // by using the '*' as shown below:
 
-[assembly : AssemblyVersion("0.7.5.*")]
+[assembly : AssemblyVersion("0.7.6.*")]
 [assembly : AssemblyFileVersion("0.6.5.0")]

OpenSim/Framework/Configuration/HTTP/Properties/AssemblyInfo.cs

@@ -29,5 +29,5 @@ using System.Runtime.InteropServices;
 //      Build Number
 //      Revision
 //
-[assembly: AssemblyVersion("0.7.5.*")]
+[assembly: AssemblyVersion("0.7.6.*")]
 [assembly: AssemblyFileVersion("1.0.0.0")]

OpenSim/Framework/Configuration/XML/Properties/AssemblyInfo.cs

@@ -29,5 +29,5 @@ using System.Runtime.InteropServices;
 //      Build Number
 //      Revision
 //
-[assembly: AssemblyVersion("0.7.5.*")]
+[assembly: AssemblyVersion("0.7.6.*")]
 [assembly: AssemblyFileVersion("1.0.0.0")]

OpenSim/Framework/Console/AssemblyInfo.cs

@@ -55,4 +55,4 @@ using System.Runtime.InteropServices;
 // You can specify all values by your own or you can build default build and revision
 // numbers with the '*' character (the default):
 
-[assembly : AssemblyVersion("0.7.5.*")]
+[assembly : AssemblyVersion("0.7.6.*")]

OpenSim/Framework/DAMap.cs

@@ -0,0 +1,260 @@
+/*
+ * Copyright (c) Contributors, http://opensimulator.org/
+ * See CONTRIBUTORS.TXT for a full list of copyright holders.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions are met:
+ *     * Redistributions of source code must retain the above copyright
+ *       notice, this list of conditions and the following disclaimer.
+ *     * Redistributions in binary form must reproduce the above copyright
+ *       notice, this list of conditions and the following disclaimer in the
+ *       documentation and/or other materials provided with the distribution.
+ *     * Neither the name of the OpenSimulator Project nor the
+ *       names of its contributors may be used to endorse or promote products
+ *       derived from this software without specific prior written permission.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE DEVELOPERS ``AS IS'' AND ANY
+ * EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
+ * WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
+ * DISCLAIMED. IN NO EVENT SHALL THE CONTRIBUTORS BE LIABLE FOR ANY
+ * DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
+ * (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
+ * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
+ * ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+ * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
+ * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+ */
+
+using System;
+using System.Collections;
+using System.Collections.Generic;
+using System.IO;
+using System.Text;
+using System.Xml;
+using System.Xml.Schema;
+using System.Xml.Serialization;
+using OpenMetaverse;
+using OpenMetaverse.StructuredData;
+
+namespace OpenSim.Framework
+{
+    /// <summary>
+    /// This class stores and retrieves dynamic attributes.
+    /// </summary>
+    /// <remarks>
+    /// Modules that want to use dynamic attributes need to do so in a private data store
+    /// which is accessed using a unique name. DAMap provides access to the data stores,
+    /// each of which is an OSDMap. Modules are free to store any type of data they want
+    /// within their data store. However, avoid storing large amounts of data because that
+    /// would slow down database access.
+    /// </remarks>
+    public class DAMap : IDictionary<string, OSDMap>, IXmlSerializable
+    {
+        private static readonly int MIN_STORE_NAME_LENGTH = 4;
+
+        protected OSDMap m_map;
+        
+        public DAMap() { m_map = new OSDMap(); }
+        
+        public XmlSchema GetSchema() { return null; } 
+
+        public static DAMap FromXml(string rawXml)
+        {
+            DAMap map = new DAMap();
+            map.ReadXml(rawXml);
+            return map;
+        }
+        
+        public void ReadXml(string rawXml)
+        {            
+            // System.Console.WriteLine("Trying to deserialize [{0}]", rawXml);
+            
+            lock (this)
+                m_map = (OSDMap)OSDParser.DeserializeLLSDXml(rawXml);         
+        }
+        
+        public void ReadXml(XmlReader reader)
+        { 
+            ReadXml(reader.ReadInnerXml());            
+        }
+        
+        public string ToXml()
+        {
+            lock (this)
+                return OSDParser.SerializeLLSDXmlString(m_map);
+        }
+
+        public void WriteXml(XmlWriter writer)
+        {
+            writer.WriteRaw(ToXml());
+        }
+        
+        public void CopyFrom(DAMap other)
+        {
+            // Deep copy
+            
+            string data = null;
+            lock (other)
+            {
+                if (other.Count > 0)
+                {
+                    data = OSDParser.SerializeLLSDXmlString(other.m_map);
+                }
+            }
+            
+            lock (this)
+            {
+                if (data == null)
+                    Clear();
+                else
+                    m_map = (OSDMap)OSDParser.DeserializeLLSDXml(data);
+            }
+        }
+
+        /// <summary>
+        /// Returns the number of data stores.
+        /// </summary>
+        public int Count { get { lock (this) { return m_map.Count; } } }
+        
+        public bool IsReadOnly { get { return false; } }
+        
+        /// <summary>
+        /// Returns the names of the data stores.
+        /// </summary>
+        public ICollection<string> Keys { get { lock (this) { return m_map.Keys; } } }
+
+        /// <summary>
+        /// Returns all the data stores.
+        /// </summary>
+        public ICollection<OSDMap> Values
+        {
+            get
+            {
+                lock (this)
+                {
+                    List<OSDMap> stores = new List<OSDMap>(m_map.Count);
+                    foreach (OSD llsd in m_map.Values)
+                        stores.Add((OSDMap)llsd);
+                    return stores;
+                }
+            }
+        }
+        
+        /// <summary>
+        /// Gets or sets one data store.
+        /// </summary>
+        /// <param name="key">Store name</param>
+        /// <returns></returns>
+        public OSDMap this[string key] 
+        {    
+            get  
+            {                    
+                OSD llsd;
+                
+                lock (this)
+                {
+                    if (m_map.TryGetValue(key, out llsd))
+                        return (OSDMap)llsd;
+                    else 
+                        return null;
+                }
+            }    
+            
+            set
+            {
+                ValidateKey(key);
+                lock (this)
+                    m_map[key] = value;
+            }
+        }
+
+        private static void ValidateKey(string key)
+        {
+            if (key.Length < MIN_STORE_NAME_LENGTH)
+                throw new Exception("Minimum store name length is " + MIN_STORE_NAME_LENGTH);
+        }
+
+        public bool ContainsKey(string key) 
+        {    
+            lock (this)
+                return m_map.ContainsKey(key);
+        }    
+
+        public void Add(string key, OSDMap store)
+        {
+            ValidateKey(key);
+            lock (this)
+                m_map.Add(key, store);
+        }    
+
+        public void Add(KeyValuePair<string, OSDMap> kvp) 
+        {    
+            lock (this)
+                m_map.Add(kvp.Key, kvp.Value);
+        }    
+
+        public bool Remove(string key) 
+        {    
+            lock (this)
+                return m_map.Remove(key);
+        }    
+
+        public bool TryGetValue(string key, out OSDMap store)
+        {
+            lock (this)
+            {
+                OSD llsd;
+                if (m_map.TryGetValue(key, out llsd))
+                {
+                    store = (OSDMap)llsd;
+                    return true;
+                }
+                else
+                {
+                    store = null;
+                    return false;
+                }
+            }
+        }    
+
+        public void Clear()
+        {
+            lock (this)
+                m_map.Clear();
+        }  
+        
+        public bool Contains(KeyValuePair<string, OSDMap> kvp)
+        {
+            lock (this)
+                return m_map.ContainsKey(kvp.Key);
+        }
+
+        public void CopyTo(KeyValuePair<string, OSDMap>[] array, int index)
+        {
+            throw new NotImplementedException();
+        }
+
+        public bool Remove(KeyValuePair<string, OSDMap> kvp)
+        {
+            lock (this)
+                return m_map.Remove(kvp.Key);
+        }
+
+        public System.Collections.IDictionaryEnumerator GetEnumerator()
+        {
+            lock (this)
+                return m_map.GetEnumerator();
+        }
+
+        IEnumerator<KeyValuePair<string, OSDMap>> IEnumerable<KeyValuePair<string, OSDMap>>.GetEnumerator()
+        {
+            return null;
+        }
+
+        IEnumerator IEnumerable.GetEnumerator()
+        {
+            lock (this)
+                return m_map.GetEnumerator();
+        }        
+    }
+}

OpenSim/Framework/Monitoring/Properties/AssemblyInfo.cs

@@ -29,5 +29,5 @@ using System.Runtime.InteropServices;
 //      Build Number
 //      Revision
 //
-[assembly: AssemblyVersion("0.7.5.*")]
+[assembly: AssemblyVersion("0.7.6.*")]
 [assembly: AssemblyFileVersion("1.0.0.0")]

OpenSim/Framework/RegionLoader/Filesystem/Properties/AssemblyInfo.cs

@@ -29,5 +29,5 @@ using System.Runtime.InteropServices;
 //      Build Number
 //      Revision
 //
-[assembly: AssemblyVersion("0.7.5.*")]
+[assembly: AssemblyVersion("0.7.6.*")]
 [assembly: AssemblyFileVersion("1.0.0.0")]

OpenSim/Framework/RegionLoader/Web/Properties/AssemblyInfo.cs

@@ -29,5 +29,5 @@ using System.Runtime.InteropServices;
 //      Build Number
 //      Revision
 //
-[assembly: AssemblyVersion("0.7.5.*")]
+[assembly: AssemblyVersion("0.7.6.*")]
 [assembly: AssemblyFileVersion("1.0.0.0")]

OpenSim/Framework/Serialization/Properties/AssemblyInfo.cs

@@ -29,5 +29,5 @@ using System.Runtime.InteropServices;
 //      Build Number
 //      Revision
 //
-[assembly: AssemblyVersion("0.7.5.*")]
+[assembly: AssemblyVersion("0.7.6.*")]
 [assembly: AssemblyFileVersion("1.0.0.0")]

OpenSim/Framework/Servers/HttpServer/Properties/AssemblyInfo.cs

@@ -29,5 +29,5 @@ using System.Runtime.InteropServices;
 //      Build Number
 //      Revision
 //
-[assembly: AssemblyVersion("0.7.5.*")]
+[assembly: AssemblyVersion("0.7.6.*")]
 [assembly: AssemblyFileVersion("1.0.0.0")]

OpenSim/Framework/Servers/Properties/AssemblyInfo.cs

@@ -29,5 +29,5 @@ using System.Runtime.InteropServices;
 //      Build Number
 //      Revision
 //
-[assembly: AssemblyVersion("0.7.5.*")]
+[assembly: AssemblyVersion("0.7.6.*")]
 [assembly: AssemblyFileVersion("1.0.0.0")]

OpenSim/Framework/Servers/VersionInfo.cs

@@ -29,7 +29,7 @@ namespace OpenSim
 {
     public class VersionInfo
     {
-        private const string VERSION_NUMBER = "0.7.5CM";
+        private const string VERSION_NUMBER = "0.7.6CM";
         private const Flavour VERSION_FLAVOUR = Flavour.Dev;
 
         public enum Flavour

OpenSim/Region/ClientStack/Linden/Caps/Properties/AssemblyInfo.cs

@@ -29,5 +29,5 @@ using System.Runtime.InteropServices;
 //      Build Number
 //      Revision
 //
-[assembly: AssemblyVersion("0.7.5.*")]
+[assembly: AssemblyVersion("0.7.6.*")]
 [assembly: AssemblyFileVersion("1.0.0.0")]

OpenSim/Region/ClientStack/Linden/UDP/Properties/AssemblyInfo.cs

@@ -29,5 +29,5 @@ using System.Runtime.InteropServices;
 //      Build Number
 //      Revision
 //
-[assembly: AssemblyVersion("0.7.5.*")]
+[assembly: AssemblyVersion("0.7.6.*")]
 [assembly: AssemblyFileVersion("1.0.0.0")]

OpenSim/Region/ClientStack/Properties/AssemblyInfo.cs

@@ -29,5 +29,5 @@ using System.Runtime.InteropServices;
 //      Build Number
 //      Revision
 //
-[assembly: AssemblyVersion("0.7.5.*")]
+[assembly: AssemblyVersion("0.7.6.*")]
 [assembly: AssemblyFileVersion("1.0.0.0")]

OpenSim/Region/CoreModules/Framework/DynamicAttributes/DAExampleModule.cs

@@ -0,0 +1,107 @@
+/*
+ * Copyright (c) Contributors, http://opensimulator.org/
+ * See CONTRIBUTORS.TXT for a full list of copyright holders.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions are met:
+ *     * Redistributions of source code must retain the above copyright
+ *       notice, this list of conditions and the following disclaimer.
+ *     * Redistributions in binary form must reproduce the above copyright
+ *       notice, this list of conditions and the following disclaimer in the
+ *       documentation and/or other materials provided with the distribution.
+ *     * Neither the name of the OpenSimulator Project nor the
+ *       names of its contributors may be used to endorse or promote products
+ *       derived from this software without specific prior written permission.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE DEVELOPERS ``AS IS'' AND ANY
+ * EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
+ * WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
+ * DISCLAIMED. IN NO EVENT SHALL THE CONTRIBUTORS BE LIABLE FOR ANY
+ * DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
+ * (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
+ * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
+ * ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+ * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
+ * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+ */
+
+using System;
+using System.Collections.Generic;
+using System.Reflection;
+using log4net;
+using Mono.Addins;
+using Nini.Config;
+using OpenMetaverse;
+using OpenMetaverse.Packets;
+using OpenMetaverse.StructuredData;
+using OpenSim.Framework;
+using OpenSim.Region.Framework;
+using OpenSim.Region.Framework.Interfaces;
+using OpenSim.Region.Framework.Scenes;
+
+namespace OpenSim.Region.Framework.DynamicAttributes.DAExampleModule
+{
+    [Extension(Path = "/OpenSim/RegionModules", NodeName = "RegionModule", Id = "DAExampleModule")]
+    public class DAExampleModule : INonSharedRegionModule
+    {
+        private static readonly ILog m_log = LogManager.GetLogger(MethodBase.GetCurrentMethod().DeclaringType);
+
+        private static readonly bool ENABLED = false;   // enable for testing
+
+        protected Scene m_scene;
+        protected IDialogModule m_dialogMod;
+        
+        public string Name { get { return "DAExample Module"; } }        
+        public Type ReplaceableInterface { get { return null; } }        
+
+        public void Initialise(IConfigSource source) {}
+        
+        public void AddRegion(Scene scene)
+        {
+            if (ENABLED)
+            {
+                m_scene = scene;
+                m_scene.EventManager.OnSceneGroupMove += OnSceneGroupMove;
+                m_dialogMod = m_scene.RequestModuleInterface<IDialogModule>();
+            }
+        }
+        
+        public void RemoveRegion(Scene scene) 
+        {
+            if (ENABLED)
+            {
+                m_scene.EventManager.OnSceneGroupMove -= OnSceneGroupMove;
+            }
+        }
+        
+        public void RegionLoaded(Scene scene) {}
+        
+        public void Close() 
+        {
+            RemoveRegion(m_scene);
+        }
+        
+        protected bool OnSceneGroupMove(UUID groupId, Vector3 delta)
+        {
+            OSDMap attrs = null;
+            SceneObjectPart sop = m_scene.GetSceneObjectPart(groupId);
+            if (!sop.DynAttrs.TryGetValue(Name, out attrs))
+                attrs = new OSDMap();
+            
+            OSDInteger newValue;
+                
+            if (!attrs.ContainsKey("moves"))
+                newValue = new OSDInteger(1);
+            else
+                newValue = new OSDInteger(((OSDInteger)attrs["moves"]).AsInteger() + 1);
+                    
+            attrs["moves"] = newValue;
+
+            sop.DynAttrs[Name] = attrs;
+    
+            m_dialogMod.SendGeneralAlert(string.Format("{0} {1} moved {2} times", sop.Name, sop.UUID, newValue));
+            
+            return true;
+        }
+    }
+}

OpenSim/Region/CoreModules/Properties/AssemblyInfo.cs

@@ -30,7 +30,7 @@ using Mono.Addins;
 //      Build Number
 //      Revision
 //
-[assembly: AssemblyVersion("0.7.5.*")]
+[assembly: AssemblyVersion("0.7.6.*")]
 [assembly: AssemblyFileVersion("1.0.0.0")]
 
 [assembly: Addin("OpenSim.Region.CoreModules", "0.1")]

OpenSim/Region/CoreModules/World/Serialiser/Tests/SerialiserTests.cs

@@ -35,6 +35,7 @@ using OpenSim.Framework;
 using OpenSim.Region.Framework.Scenes;
 using OpenSim.Region.Framework.Scenes.Serialization;
 using OpenSim.Tests.Common;
+using OpenMetaverse.StructuredData;
 
 namespace OpenSim.Region.CoreModules.World.Serialiser.Tests
 {
@@ -143,6 +144,7 @@ namespace OpenSim.Region.CoreModules.World.Serialiser.Tests
                     <Flags>None</Flags>
                     <CollisionSound><Guid>00000000-0000-0000-0000-000000000000</Guid></CollisionSound>
                     <CollisionSoundVolume>0</CollisionSoundVolume>
+                    <DynAttrs><llsd><map><key>MyStore</key><map><key>the answer</key><integer>42</integer></map></map></llsd></DynAttrs>
                 </SceneObjectPart>
             </RootPart>
             <OtherParts />
@@ -331,6 +333,7 @@ namespace OpenSim.Region.CoreModules.World.Serialiser.Tests
                 <EveryoneMask>0</EveryoneMask>
                 <NextOwnerMask>2147483647</NextOwnerMask>
                 <Flags>None</Flags>
+                <DynAttrs><llsd><map><key>MyStore</key><map><key>last words</key><string>Rosebud</string></map></map></llsd></DynAttrs>
                 <SitTargetAvatar><UUID>00000000-0000-0000-0000-000000000000</UUID></SitTargetAvatar>
             </SceneObjectPart>
             <OtherParts />
@@ -359,6 +362,8 @@ namespace OpenSim.Region.CoreModules.World.Serialiser.Tests
             Assert.That(rootPart.UUID, Is.EqualTo(new UUID("e6a5a05e-e8cc-4816-8701-04165e335790")));
             Assert.That(rootPart.CreatorID, Is.EqualTo(new UUID("a6dacf01-4636-4bb9-8a97-30609438af9d")));
             Assert.That(rootPart.Name, Is.EqualTo("PrimMyRide"));
+            OSDMap store = rootPart.DynAttrs["MyStore"];
+            Assert.AreEqual(42, store["the answer"].AsInteger());
 
             // TODO: Check other properties
         }
@@ -409,6 +414,14 @@ namespace OpenSim.Region.CoreModules.World.Serialiser.Tests
             rp.CreatorID = rpCreatorId;
             rp.Shape = shape;
 
+            string daStoreName = "MyStore";
+            string daKey = "foo";
+            string daValue = "bar";
+            OSDMap myStore = new OSDMap();
+            myStore.Add(daKey, daValue);
+            rp.DynAttrs = new DAMap();
+            rp.DynAttrs[daStoreName] = myStore;
+
             SceneObjectGroup so = new SceneObjectGroup(rp);
 
             // Need to add the object to the scene so that the request to get script state succeeds
@@ -424,6 +437,7 @@ namespace OpenSim.Region.CoreModules.World.Serialiser.Tests
             UUID uuid = UUID.Zero;
             string name = null;
             UUID creatorId = UUID.Zero;
+            DAMap daMap = null;
 
             while (xtr.Read() && xtr.Name != "SceneObjectPart")
             {
@@ -449,6 +463,10 @@ namespace OpenSim.Region.CoreModules.World.Serialiser.Tests
                         creatorId = UUID.Parse(xtr.ReadElementString("UUID"));
                         xtr.ReadEndElement();
                         break;
+                    case "DynAttrs":
+                        daMap = new DAMap();
+                        daMap.ReadXml(xtr);
+                        break;
                 }
             }
 
@@ -462,6 +480,8 @@ namespace OpenSim.Region.CoreModules.World.Serialiser.Tests
             Assert.That(uuid, Is.EqualTo(rpUuid));
             Assert.That(name, Is.EqualTo(rpName));
             Assert.That(creatorId, Is.EqualTo(rpCreatorId));
+            Assert.NotNull(daMap);
+            Assert.AreEqual(daValue, daMap[daStoreName][daKey].AsString());
         }
 
         [Test]
@@ -476,6 +496,8 @@ namespace OpenSim.Region.CoreModules.World.Serialiser.Tests
             Assert.That(rootPart.UUID, Is.EqualTo(new UUID("9be68fdd-f740-4a0f-9675-dfbbb536b946")));
             Assert.That(rootPart.CreatorID, Is.EqualTo(new UUID("b46ef588-411e-4a8b-a284-d7dcfe8e74ef")));
             Assert.That(rootPart.Name, Is.EqualTo("PrimFun"));
+            OSDMap store = rootPart.DynAttrs["MyStore"];
+            Assert.AreEqual("Rosebud", store["last words"].AsString());
 
             // TODO: Check other properties
         }
@@ -500,6 +522,14 @@ namespace OpenSim.Region.CoreModules.World.Serialiser.Tests
             rp.CreatorID = rpCreatorId;
             rp.Shape = shape;
 
+            string daStoreName = "MyStore";
+            string daKey = "foo";
+            string daValue = "bar";
+            OSDMap myStore = new OSDMap();
+            myStore.Add(daKey, daValue);
+            rp.DynAttrs = new DAMap();
+            rp.DynAttrs[daStoreName] = myStore;
+
             SceneObjectGroup so = new SceneObjectGroup(rp);
 
             // Need to add the object to the scene so that the request to get script state succeeds
@@ -516,6 +546,7 @@ namespace OpenSim.Region.CoreModules.World.Serialiser.Tests
             UUID uuid = UUID.Zero;
             string name = null;
             UUID creatorId = UUID.Zero;
+            DAMap daMap = null;
 
             while (xtr.Read() && xtr.Name != "SceneObjectPart")
             {
@@ -537,6 +568,10 @@ namespace OpenSim.Region.CoreModules.World.Serialiser.Tests
                         creatorId = UUID.Parse(xtr.ReadElementString("Guid"));
                         xtr.ReadEndElement();
                         break;
+                    case "DynAttrs":
+                        daMap = new DAMap();
+                        daMap.ReadXml(xtr);
+                        break;
                 }
             }
 
@@ -549,6 +584,8 @@ namespace OpenSim.Region.CoreModules.World.Serialiser.Tests
             Assert.That(uuid, Is.EqualTo(rpUuid));
             Assert.That(name, Is.EqualTo(rpName));
             Assert.That(creatorId, Is.EqualTo(rpCreatorId));
+            Assert.NotNull(daMap);
+            Assert.AreEqual(daValue, daMap[daStoreName][daKey].AsString());
         }
     }
 }

OpenSim/Region/DataSnapshot/Properties/AssemblyInfo.cs

@@ -29,5 +29,5 @@ using System.Runtime.InteropServices;
 //      Build Number
 //      Revision
 //
-[assembly: AssemblyVersion("0.7.5.*")]
+[assembly: AssemblyVersion("0.7.6.*")]
 [assembly: AssemblyFileVersion("1.0.0.0")]

OpenSim/Region/Framework/Properties/AssemblyInfo.cs

@@ -29,5 +29,5 @@ using System.Runtime.InteropServices;
 //      Build Number
 //      Revision
 //
-[assembly: AssemblyVersion("0.7.5.*")]
+[assembly: AssemblyVersion("0.7.6.*")]
 [assembly: AssemblyFileVersion("1.0.0.0")]

OpenSim/Region/Framework/Scenes/SceneObjectPart.cs

@@ -37,6 +37,7 @@ using System.Xml.Serialization;
 using log4net;
 using OpenMetaverse;
 using OpenMetaverse.Packets;
+using OpenMetaverse.StructuredData;
 using OpenSim.Framework;
 using OpenSim.Region.Framework.Interfaces;
 using OpenSim.Region.Framework.Scenes.Scripting;
@@ -136,6 +137,11 @@ namespace OpenSim.Region.Framework.Scenes
 
         private static readonly ILog m_log = LogManager.GetLogger(MethodBase.GetCurrentMethod().DeclaringType);
 
+        /// <summary>
+        /// Dynamic attributes can be created and deleted as required.
+        /// </summary>
+        public DAMap DynAttrs { get; set; }
+        
         /// <value>
         /// Is this a root part?
         /// </value>
@@ -386,6 +392,7 @@ namespace OpenSim.Region.Framework.Scenes
             m_particleSystem = Utils.EmptyBytes;
             Rezzed = DateTime.UtcNow;
             Description = String.Empty;
+            DynAttrs = new DAMap();
 
             // Prims currently only contain a single folder (Contents).  From looking at the Second Life protocol,
             // this appears to have the same UUID (!) as the prim.  If this isn't the case, one can't drag items from
@@ -2118,6 +2125,8 @@ namespace OpenSim.Region.Framework.Scenes
             // safeguard  actual copy is done in sog.copy
             dupe.KeyframeMotion = null;
 
+            dupe.DynAttrs.CopyFrom(DynAttrs);
+            
             if (userExposed)
             {
 /*

OpenSim/Region/Framework/Scenes/Serialization/SceneObjectSerializer.cs

@@ -365,6 +365,7 @@ namespace OpenSim.Region.Framework.Scenes.Serialization
             m_SOPXmlProcessors.Add("CollisionSound", ProcessCollisionSound);
             m_SOPXmlProcessors.Add("CollisionSoundVolume", ProcessCollisionSoundVolume);
             m_SOPXmlProcessors.Add("MediaUrl", ProcessMediaUrl);
+            m_SOPXmlProcessors.Add("DynAttrs", ProcessDynAttrs);
             m_SOPXmlProcessors.Add("TextureAnimation", ProcessTextureAnimation);
             m_SOPXmlProcessors.Add("ParticleSystem", ProcessParticleSystem);
             m_SOPXmlProcessors.Add("PayPrice0", ProcessPayPrice0);
@@ -797,6 +798,11 @@ namespace OpenSim.Region.Framework.Scenes.Serialization
             obj.MediaUrl = reader.ReadElementContentAsString("MediaUrl", String.Empty);
         }
 
+        private static void ProcessDynAttrs(SceneObjectPart obj, XmlTextReader reader)
+        {
+            obj.DynAttrs.ReadXml(reader);
+        }
+
         private static void ProcessTextureAnimation(SceneObjectPart obj, XmlTextReader reader)
         {
             obj.TextureAnimation = Convert.FromBase64String(reader.ReadElementContentAsString("TextureAnimation", String.Empty));
@@ -1339,6 +1345,14 @@ namespace OpenSim.Region.Framework.Scenes.Serialization
             writer.WriteElementString("CollisionSoundVolume", sop.CollisionSoundVolume.ToString());
             if (sop.MediaUrl != null)
                 writer.WriteElementString("MediaUrl", sop.MediaUrl.ToString());
+            
+            if (sop.DynAttrs.Count > 0)
+            {
+                writer.WriteStartElement("DynAttrs");
+                sop.DynAttrs.WriteXml(writer);
+                writer.WriteEndElement();
+            }
+
             WriteBytes(writer, "TextureAnimation", sop.TextureAnimation);
             WriteBytes(writer, "ParticleSystem", sop.ParticleSystem);
             writer.WriteElementString("PayPrice0", sop.PayPrice[0].ToString());

OpenSim/Region/OptionalModules/Properties/AssemblyInfo.cs

@@ -30,7 +30,7 @@ using Mono.Addins;
 //      Build Number
 //      Revision
 //
-[assembly: AssemblyVersion("0.7.5.*")]
+[assembly: AssemblyVersion("0.7.6.*")]
 [assembly: AssemblyFileVersion("1.0.0.0")]
 
 [assembly: Addin("OpenSim.Region.OptionalModules", "0.1")]

OpenSim/Region/Physics/BasicPhysicsPlugin/AssemblyInfo.cs

@@ -55,4 +55,4 @@ using System.Runtime.InteropServices;
 // You can specify all values by your own or you can build default build and revision
 // numbers with the '*' character (the default):
 
-[assembly : AssemblyVersion("0.7.5.*")]
+[assembly : AssemblyVersion("0.7.6.*")]

OpenSim/Region/Physics/BulletSPlugin/Properties/AssemblyInfo.cs

@@ -29,5 +29,5 @@ using System.Runtime.InteropServices;
 //      Build Number
 //      Revision
 //
-[assembly: AssemblyVersion("0.7.5.*")]
+[assembly: AssemblyVersion("0.7.6.*")]
 [assembly: AssemblyFileVersion("1.0.0.0")]

OpenSim/Region/Physics/ConvexDecompositionDotNet/Properties/AssemblyInfo.cs

@@ -32,5 +32,5 @@ using System.Runtime.InteropServices;
 // You can specify all the values or you can default the Build and Revision Numbers 
 // by using the '*' as shown below:
 // [assembly: AssemblyVersion("1.0.*")]
-[assembly: AssemblyVersion("0.7.5.*")]
+[assembly: AssemblyVersion("0.7.6.*")]
 [assembly: AssemblyFileVersion("1.0.0.0")]

OpenSim/Region/Physics/Manager/AssemblyInfo.cs

@@ -55,4 +55,4 @@ using System.Runtime.InteropServices;
 // You can specify all values by your own or you can build default build and revision
 // numbers with the '*' character (the default):
 
-[assembly : AssemblyVersion("0.7.5.*")]
+[assembly : AssemblyVersion("0.7.6.*")]

OpenSim/Region/Physics/Meshing/Properties/AssemblyInfo.cs

@@ -29,5 +29,5 @@ using System.Runtime.InteropServices;
 //      Build Number
 //      Revision
 //
-[assembly: AssemblyVersion("0.7.5.*")]
+[assembly: AssemblyVersion("0.7.6.*")]
 [assembly: AssemblyFileVersion("1.0.0.0")]

OpenSim/Region/Physics/OdePlugin/AssemblyInfo.cs

@@ -55,4 +55,4 @@ using System.Runtime.InteropServices;
 // You can specify all values by your own or you can build default build and revision
 // numbers with the '*' character (the default):
 
-[assembly : AssemblyVersion("0.7.5.*")]
+[assembly : AssemblyVersion("0.7.6.*")]

OpenSim/Region/Physics/POSPlugin/AssemblyInfo.cs

@@ -55,4 +55,4 @@ using System.Runtime.InteropServices;
 // You can specify all values by your own or you can build default build and revision
 // numbers with the '*' character (the default):
 
-[assembly : AssemblyVersion("0.7.5.*")]
+[assembly : AssemblyVersion("0.7.6.*")]

OpenSim/Region/Physics/UbitOdePlugin/ODERayCastRequestManager.cs

@@ -300,9 +300,9 @@ namespace OpenSim.Region.Physics.OdePlugin
                 ((ProbeSphereCallback)req.callbackMethod)(cresult);
         }
 
-        private const RayFilterFlags FilterActiveSpace = RayFilterFlags.agent | RayFilterFlags.physical | RayFilterFlags.LSLPhanton;
+        private const RayFilterFlags FilterActiveSpace = RayFilterFlags.agent | RayFilterFlags.physical | RayFilterFlags.LSLPhantom;
 //        private const RayFilterFlags FilterStaticSpace = RayFilterFlags.water | RayFilterFlags.land | RayFilterFlags.nonphysical | RayFilterFlags.LSLPhanton;
-        private const RayFilterFlags FilterStaticSpace = RayFilterFlags.water | RayFilterFlags.nonphysical | RayFilterFlags.LSLPhanton;
+        private const RayFilterFlags FilterStaticSpace = RayFilterFlags.water | RayFilterFlags.nonphysical | RayFilterFlags.LSLPhantom;
 
         private void doSpaceRay(ODERayRequest req)
         {
@@ -680,4 +680,4 @@ namespace OpenSim.Region.Physics.OdePlugin
         public RayFilterFlags filter;
         public Quaternion orientation;
     }
-}
+}

OpenSim/Region/RegionCombinerModule/Properties/AssemblyInfo.cs

@@ -29,5 +29,5 @@ using System.Runtime.InteropServices;
 //      Build Number
 //      Revision
 //
-[assembly: AssemblyVersion("0.7.5.*")]
+[assembly: AssemblyVersion("0.7.6.*")]
 [assembly: AssemblyFileVersion("1.0.0.0")]

OpenSim/Region/ScriptEngine/Shared/Api/Implementation/MOD_Api.cs

@@ -29,8 +29,10 @@ using System;
 using System.Reflection;
 using System.Collections;
 using System.Collections.Generic;
+using System.Reflection;
 using System.Runtime.Remoting.Lifetime;
 using System.Threading;
+using log4net;
 using OpenMetaverse;
 using Nini.Config;
 using OpenSim;
@@ -56,6 +58,8 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api
     [Serializable]
     public class MOD_Api : MarshalByRefObject, IMOD_Api, IScriptApi
     {
+//        private static readonly ILog m_log = LogManager.GetLogger(MethodBase.GetCurrentMethod().DeclaringType);
+
         internal IScriptEngine m_ScriptEngine;
         internal SceneObjectPart m_host;
         internal TaskInventoryItem m_item;
@@ -109,8 +113,10 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api
             if (message.Length > 1023)
                 message = message.Substring(0, 1023);
 
-            World.SimChat(Utils.StringToBytes(message),
+            World.SimChat(
-                          ChatTypeEnum.Shout, ScriptBaseClass.DEBUG_CHANNEL, m_host.ParentGroup.RootPart.AbsolutePosition, m_host.Name, m_host.UUID, true);
+                Utils.StringToBytes(message),
+                ChatTypeEnum.Shout, ScriptBaseClass.DEBUG_CHANNEL, 
+                m_host.ParentGroup.RootPart.AbsolutePosition, m_host.Name, m_host.UUID, false);
 
             IWorldComm wComm = m_ScriptEngine.World.RequestModuleInterface<IWorldComm>();
             wComm.DeliverMessage(ChatTypeEnum.Shout, ScriptBaseClass.DEBUG_CHANNEL, m_host.Name, m_host.UUID, message);
@@ -124,6 +130,12 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api
         /// <returns>string result of the invocation</returns>
         public void modInvokeN(string fname, params object[] parms)
         {
+//            m_log.DebugFormat(
+//                "[MOD API]: Invoking dynamic function {0}, args '{1}' with {2} return type", 
+//                fname, 
+//                string.Join(",", Array.ConvertAll<object, string>(parms, o => o.ToString())), 
+//                ((MethodInfo)MethodBase.GetCurrentMethod()).ReturnType);
+
             Type returntype = m_comms.LookupReturnType(fname);
             if (returntype != typeof(string))
                 MODError(String.Format("return type mismatch for {0}",fname));
@@ -133,6 +145,12 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api
 
         public LSL_String modInvokeS(string fname, params object[] parms)
         {
+//            m_log.DebugFormat(
+//                "[MOD API]: Invoking dynamic function {0}, args '{1}' with {2} return type", 
+//                fname, 
+//                string.Join(",", Array.ConvertAll<object, string>(parms, o => o.ToString())), 
+//                ((MethodInfo)MethodBase.GetCurrentMethod()).ReturnType);
+
             Type returntype = m_comms.LookupReturnType(fname);
             if (returntype != typeof(string))
                 MODError(String.Format("return type mismatch for {0}",fname));
@@ -143,6 +161,12 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api
 
         public LSL_Integer modInvokeI(string fname, params object[] parms)
         {
+//            m_log.DebugFormat(
+//                "[MOD API]: Invoking dynamic function {0}, args '{1}' with {2} return type", 
+//                fname, 
+//                string.Join(",", Array.ConvertAll<object, string>(parms, o => o.ToString())), 
+//                ((MethodInfo)MethodBase.GetCurrentMethod()).ReturnType);
+
             Type returntype = m_comms.LookupReturnType(fname);
             if (returntype != typeof(int))
                 MODError(String.Format("return type mismatch for {0}",fname));
@@ -153,6 +177,12 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api
         
         public LSL_Float modInvokeF(string fname, params object[] parms)
         {
+//            m_log.DebugFormat(
+//                "[MOD API]: Invoking dynamic function {0}, args '{1}' with {2} return type", 
+//                fname, 
+//                string.Join(",", Array.ConvertAll<object, string>(parms, o => o.ToString())), 
+//                ((MethodInfo)MethodBase.GetCurrentMethod()).ReturnType);
+
             Type returntype = m_comms.LookupReturnType(fname);
             if (returntype != typeof(float))
                 MODError(String.Format("return type mismatch for {0}",fname));
@@ -163,6 +193,12 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api
 
         public LSL_Key modInvokeK(string fname, params object[] parms)
         {
+//            m_log.DebugFormat(
+//                "[MOD API]: Invoking dynamic function {0}, args '{1}' with {2} return type", 
+//                fname, 
+//                string.Join(",", Array.ConvertAll<object, string>(parms, o => o.ToString())), 
+//                ((MethodInfo)MethodBase.GetCurrentMethod()).ReturnType);
+
             Type returntype = m_comms.LookupReturnType(fname);
             if (returntype != typeof(UUID))
                 MODError(String.Format("return type mismatch for {0}",fname));
@@ -173,6 +209,12 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api
 
         public LSL_Vector modInvokeV(string fname, params object[] parms)
         {
+//            m_log.DebugFormat(
+//                "[MOD API]: Invoking dynamic function {0}, args '{1}' with {2} return type", 
+//                fname, 
+//                string.Join(",", Array.ConvertAll<object, string>(parms, o => o.ToString())), 
+//                ((MethodInfo)MethodBase.GetCurrentMethod()).ReturnType);
+
             Type returntype = m_comms.LookupReturnType(fname);
             if (returntype != typeof(OpenMetaverse.Vector3))
                 MODError(String.Format("return type mismatch for {0}",fname));
@@ -183,6 +225,12 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api
 
         public LSL_Rotation modInvokeR(string fname, params object[] parms)
         {
+//            m_log.DebugFormat(
+//                "[MOD API]: Invoking dynamic function {0}, args '{1}' with {2} return type", 
+//                fname, 
+//                string.Join(",", Array.ConvertAll<object, string>(parms, o => o.ToString())), 
+//                ((MethodInfo)MethodBase.GetCurrentMethod()).ReturnType);
+
             Type returntype = m_comms.LookupReturnType(fname);
             if (returntype != typeof(OpenMetaverse.Quaternion))
                 MODError(String.Format("return type mismatch for {0}",fname));
@@ -193,6 +241,12 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api
 
         public LSL_List modInvokeL(string fname, params object[] parms)
         {
+//            m_log.DebugFormat(
+//                "[MOD API]: Invoking dynamic function {0}, args '{1}' with {2} return type", 
+//                fname, 
+//                string.Join(",", Array.ConvertAll<object, string>(parms, o => o.ToString())), 
+//                ((MethodInfo)MethodBase.GetCurrentMethod()).ReturnType);
+
             Type returntype = m_comms.LookupReturnType(fname);
             if (returntype != typeof(object[]))
                 MODError(String.Format("return type mismatch for {0}",fname));
@@ -250,6 +304,12 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api
                 return "";
             }
 
+//            m_log.DebugFormat(
+//                "[MOD API]: Invoking dynamic function {0}, args '{1}' with {2} return type", 
+//                fname, 
+//                string.Join(",", Array.ConvertAll<object, string>(parms, o => o.ToString())), 
+//                ((MethodInfo)MethodBase.GetCurrentMethod()).ReturnType);
+
             Type[] signature = m_comms.LookupTypeSignature(fname);
             if (signature.Length != parms.Length)
                 MODError(String.Format("wrong number of parameters to function {0}",fname));

OpenSim/Region/ScriptEngine/Shared/Api/Implementation/Properties/AssemblyInfo.cs

@@ -29,5 +29,5 @@ using System.Runtime.InteropServices;
 //      Build Number
 //      Revision
 //
-[assembly: AssemblyVersion("0.7.5.*")]
+[assembly: AssemblyVersion("0.7.6.*")]
 [assembly: AssemblyFileVersion("1.0.0.0")]

OpenSim/Region/ScriptEngine/Shared/Api/Runtime/Properties/AssemblyInfo.cs

@@ -29,5 +29,5 @@ using System.Runtime.InteropServices;
 //      Build Number
 //      Revision
 //
-[assembly: AssemblyVersion("0.7.5.*")]
+[assembly: AssemblyVersion("0.7.6.*")]
 [assembly: AssemblyFileVersion("1.0.0.0")]

OpenSim/Region/ScriptEngine/Shared/Api/Runtime/YieldProlog/Properties/AssemblyInfo.cs

@@ -29,5 +29,5 @@ using System.Runtime.InteropServices;
 //      Build Number
 //      Revision
 //
-[assembly: AssemblyVersion("0.7.5.*")]
+[assembly: AssemblyVersion("0.7.6.*")]
 [assembly: AssemblyFileVersion("1.0.0.0")]

OpenSim/Region/ScriptEngine/Shared/CodeTools/Properties/AssemblyInfo.cs

@@ -29,5 +29,5 @@ using System.Runtime.InteropServices;
 //      Build Number
 //      Revision
 //
-[assembly: AssemblyVersion("0.7.5.*")]
+[assembly: AssemblyVersion("0.7.6.*")]
 [assembly: AssemblyFileVersion("1.0.0.0")]

OpenSim/Region/ScriptEngine/Shared/Instance/Properties/AssemblyInfo.cs

@@ -29,5 +29,5 @@ using System.Runtime.InteropServices;
 //      Build Number
 //      Revision
 //
-[assembly: AssemblyVersion("0.7.5.*")]
+[assembly: AssemblyVersion("0.7.6.*")]
 [assembly: AssemblyFileVersion("1.0.0.0")]

OpenSim/Region/ScriptEngine/Shared/Properties/AssemblyInfo.cs

@@ -29,5 +29,5 @@ using System.Runtime.InteropServices;
 //      Build Number
 //      Revision
 //
-[assembly: AssemblyVersion("0.7.5.*")]
+[assembly: AssemblyVersion("0.7.6.*")]
 [assembly: AssemblyFileVersion("1.0.0.0")]

OpenSim/Region/ScriptEngine/XEngine/Properties/AssemblyInfo.cs

@@ -29,5 +29,5 @@ using System.Runtime.InteropServices;
 //      Build Number
 //      Revision
 //
-[assembly: AssemblyVersion("0.7.5.*")]
+[assembly: AssemblyVersion("0.7.6.*")]
 [assembly: AssemblyFileVersion("1.0.0.0")]

OpenSim/Region/UserStatistics/Properties/AssemblyInfo.cs

@@ -29,5 +29,5 @@ using System.Runtime.InteropServices;
 //      Build Number
 //      Revision
 //
-[assembly: AssemblyVersion("0.7.5.*")]
+[assembly: AssemblyVersion("0.7.6.*")]
 [assembly: AssemblyFileVersion("1.0.0.0")]

OpenSim/Server/Base/Properties/AssemblyInfo.cs

@@ -29,5 +29,5 @@ using System.Runtime.InteropServices;
 //      Build Number
 //      Revision
 //
-[assembly: AssemblyVersion("0.7.5.*")]
+[assembly: AssemblyVersion("0.7.6.*")]
 [assembly: AssemblyFileVersion("1.0.0.0")]

OpenSim/Server/Handlers/Properties/AssemblyInfo.cs

@@ -29,5 +29,5 @@ using System.Runtime.InteropServices;
 //      Build Number
 //      Revision
 //
-[assembly: AssemblyVersion("0.7.5.*")]
+[assembly: AssemblyVersion("0.7.6.*")]
 [assembly: AssemblyFileVersion("1.0.0.0")]

OpenSim/Server/Properties/AssemblyInfo.cs

@@ -29,5 +29,5 @@ using System.Runtime.InteropServices;
 //      Build Number
 //      Revision
 //
-[assembly: AssemblyVersion("0.7.5.*")]
+[assembly: AssemblyVersion("0.7.6.*")]
 [assembly: AssemblyFileVersion("1.0.0.0")]

OpenSim/Services/AssetService/Properties/AssemblyInfo.cs

@@ -29,5 +29,5 @@ using System.Runtime.InteropServices;
 //      Build Number
 //      Revision
 //
-[assembly: AssemblyVersion("0.7.5.*")]
+[assembly: AssemblyVersion("0.7.6.*")]
 [assembly: AssemblyFileVersion("1.0.0.0")]

OpenSim/Services/AuthenticationService/Properties/AssemblyInfo.cs

@@ -29,5 +29,5 @@ using System.Runtime.InteropServices;
 //      Build Number
 //      Revision
 //
-[assembly: AssemblyVersion("0.7.5.*")]
+[assembly: AssemblyVersion("0.7.6.*")]
 [assembly: AssemblyFileVersion("1.0.0.0")]

OpenSim/Services/AuthorizationService/Properties/AssemblyInfo.cs

@@ -29,5 +29,5 @@ using System.Runtime.InteropServices;
 //      Build Number
 //      Revision
 //
-[assembly: AssemblyVersion("0.7.5.*")]
+[assembly: AssemblyVersion("0.7.6.*")]
 [assembly: AssemblyFileVersion("1.0.0.0")]

OpenSim/Services/AvatarService/Properties/AssemblyInfo.cs

@@ -29,5 +29,5 @@ using System.Runtime.InteropServices;
 //      Build Number
 //      Revision
 //
-[assembly: AssemblyVersion("0.7.5.*")]
+[assembly: AssemblyVersion("0.7.6.*")]
 [assembly: AssemblyFileVersion("1.0.0.0")]

OpenSim/Services/Base/Properties/AssemblyInfo.cs

@@ -29,5 +29,5 @@ using System.Runtime.InteropServices;
 //      Build Number
 //      Revision
 //
-[assembly: AssemblyVersion("0.7.5.*")]
+[assembly: AssemblyVersion("0.7.6.*")]
 [assembly: AssemblyFileVersion("1.0.0.0")]

OpenSim/Services/Connectors/Properties/AssemblyInfo.cs

@@ -29,5 +29,5 @@ using System.Runtime.InteropServices;
 //      Build Number
 //      Revision
 //
-[assembly: AssemblyVersion("0.7.5.*")]
+[assembly: AssemblyVersion("0.7.6.*")]
 [assembly: AssemblyFileVersion("1.0.0.0")]

OpenSim/Services/FreeswitchService/Properties/AssemblyInfo.cs

@@ -29,5 +29,5 @@ using System.Runtime.InteropServices;
 //      Build Number
 //      Revision
 //
-[assembly: AssemblyVersion("0.7.5.*")]
+[assembly: AssemblyVersion("0.7.6.*")]
 [assembly: AssemblyFileVersion("1.0.0.0")]

OpenSim/Services/Friends/Properties/AssemblyInfo.cs

@@ -29,5 +29,5 @@ using System.Runtime.InteropServices;
 //      Build Number
 //      Revision
 //
-[assembly: AssemblyVersion("0.7.5.*")]
+[assembly: AssemblyVersion("0.7.6.*")]
 [assembly: AssemblyFileVersion("1.0.0.0")]

OpenSim/Services/GridService/Properties/AssemblyInfo.cs

@@ -29,5 +29,5 @@ using System.Runtime.InteropServices;
 //      Build Number
 //      Revision
 //
-[assembly: AssemblyVersion("0.7.5.*")]
+[assembly: AssemblyVersion("0.7.6.*")]
 [assembly: AssemblyFileVersion("1.0.0.0")]

OpenSim/Services/HypergridService/Properties/AssemblyInfo.cs

@@ -29,5 +29,5 @@ using System.Runtime.InteropServices;
 //      Build Number
 //      Revision
 //
-[assembly: AssemblyVersion("0.7.5.*")]
+[assembly: AssemblyVersion("0.7.6.*")]
 [assembly: AssemblyFileVersion("1.0.0.0")]

OpenSim/Services/Interfaces/Properties/AssemblyInfo.cs

@@ -29,5 +29,5 @@ using System.Runtime.InteropServices;
 //      Build Number
 //      Revision
 //
-[assembly: AssemblyVersion("0.7.5.*")]
+[assembly: AssemblyVersion("0.7.6.*")]
 [assembly: AssemblyFileVersion("1.0.0.0")]

OpenSim/Services/InventoryService/Properties/AssemblyInfo.cs

@@ -29,5 +29,5 @@ using System.Runtime.InteropServices;
 //      Build Number
 //      Revision
 //
-[assembly: AssemblyVersion("0.7.5.*")]
+[assembly: AssemblyVersion("0.7.6.*")]
 [assembly: AssemblyFileVersion("1.0.0.0")]

OpenSim/Services/LLLoginService/Properties/AssemblyInfo.cs

@@ -29,5 +29,5 @@ using System.Runtime.InteropServices;
 //      Build Number
 //      Revision
 //
-[assembly: AssemblyVersion("0.7.5.*")]
+[assembly: AssemblyVersion("0.7.6.*")]
 [assembly: AssemblyFileVersion("1.0.0.0")]

OpenSim/Services/MapImageService/Properties/AssemblyInfo.cs

@@ -29,5 +29,5 @@ using System.Runtime.InteropServices;
 //      Build Number
 //      Revision
 //
-[assembly: AssemblyVersion("0.7.5.*")]
+[assembly: AssemblyVersion("0.7.6.*")]
 [assembly: AssemblyFileVersion("1.0.0.0")]

OpenSim/Services/PresenceService/Properties/AssemblyInfo.cs

@@ -29,5 +29,5 @@ using System.Runtime.InteropServices;
 //      Build Number
 //      Revision
 //
-[assembly: AssemblyVersion("0.7.5.*")]
+[assembly: AssemblyVersion("0.7.6.*")]
 [assembly: AssemblyFileVersion("1.0.0.0")]

OpenSim/Services/UserAccountService/Properties/AssemblyInfo.cs

@@ -29,5 +29,5 @@ using System.Runtime.InteropServices;
 //      Build Number
 //      Revision
 //
-[assembly: AssemblyVersion("0.7.5.*")]
+[assembly: AssemblyVersion("0.7.6.*")]
 [assembly: AssemblyFileVersion("1.0.0.0")]

OpenSim/Tools/Compiler/Properties/AssemblyInfo.cs

@@ -29,5 +29,5 @@ using System.Runtime.InteropServices;
 //      Build Number
 //      Revision
 //
-[assembly: AssemblyVersion("0.7.5.*")]
+[assembly: AssemblyVersion("0.7.6.*")]
 [assembly: AssemblyFileVersion("1.0.0.0")]

OpenSim/Tools/Configger/Properties/AssemblyInfo.cs

@@ -29,5 +29,5 @@ using System.Runtime.InteropServices;
 //      Build Number
 //      Revision
 //
-[assembly: AssemblyVersion("0.7.5.*")]
+[assembly: AssemblyVersion("0.7.6.*")]
 [assembly: AssemblyFileVersion("1.0.0.0")]

OpenSim/Tools/pCampBot/Properties/AssemblyInfo.cs

@@ -29,5 +29,5 @@ using System.Runtime.InteropServices;
 //      Build Number
 //      Revision
 //
-[assembly: AssemblyVersion("0.7.5.*")]
+[assembly: AssemblyVersion("0.7.6.*")]
 [assembly: AssemblyFileVersion("1.0.0.0")]

ThirdParty/SmartThreadPool/AssemblyInfo.cs

@@ -29,7 +29,7 @@ using System.Runtime.InteropServices;
 // You can specify all the values or you can default the Revision and Build Numbers 
 // by using the '*' as shown below:
 
-[assembly: AssemblyVersion("0.7.5.*")]
+[assembly: AssemblyVersion("0.7.6.*")]
 
 //
 // In order to sign your assembly you must specify a key to use. Refer to the 

prebuild.xml

@@ -3148,6 +3148,7 @@
       <Reference name="System.Drawing"/>
       <Reference name="OpenMetaverseTypes" path="../../../bin/"/>
       <Reference name="OpenMetaverse" path="../../../bin/"/>
+      <Reference name="OpenMetaverse.StructuredData" path="../../../bin/"/>
       <Reference name="OpenSim.Data"/>
       <Reference name="OpenSim.Data.Null"/>
       <Reference name="OpenSim.Framework"/>