* Minor MRM Cleanup

* Interfaces now live in Interfaces subdirectory. 
* Namespace does not yet reflect this change.
* Final namespace for MRMs will probably sit somewhere around OpenSim.Extend.MRM[?]

14 files changed, 662 insertions, 614 deletions

diff --git a/OpenSim/Region/OptionalModules/Scripting/Minimodule/IAvatar.cs b/OpenSim/Region/OptionalModules/Scripting/Minimodule/Interfaces/IAvatar.cs
index fef85dd..92ef490 100644
--- a/OpenSim/Region/OptionalModules/Scripting/Minimodule/IAvatar.cs
+++ b/OpenSim/Region/OptionalModules/Scripting/Minimodule/Interfaces/IAvatar.cs
@@ -1,39 +1,39 @@
-/*
- * 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.Text;
-using OpenMetaverse;
-
-namespace OpenSim.Region.OptionalModules.Scripting.Minimodule
-{
-    public interface IAvatar : IEntity
-    {
-        
-    }
-}
+/*

+ * 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.Text;

+using OpenMetaverse;

+

+namespace OpenSim.Region.OptionalModules.Scripting.Minimodule

+{

+    public interface IAvatar : IEntity

+    {

+        

+    }

+}

diff --git a/OpenSim/Region/OptionalModules/Scripting/Minimodule/IEntity.cs b/OpenSim/Region/OptionalModules/Scripting/Minimodule/Interfaces/IEntity.cs
index 94c53e3..94c53e3 100644
--- a/OpenSim/Region/OptionalModules/Scripting/Minimodule/IEntity.cs
+++ b/OpenSim/Region/OptionalModules/Scripting/Minimodule/Interfaces/IEntity.cs
diff --git a/OpenSim/Region/OptionalModules/Scripting/Minimodule/IGraphics.cs b/OpenSim/Region/OptionalModules/Scripting/Minimodule/Interfaces/IGraphics.cs
index f4bc12e..f4bc12e 100644
--- a/OpenSim/Region/OptionalModules/Scripting/Minimodule/IGraphics.cs
+++ b/OpenSim/Region/OptionalModules/Scripting/Minimodule/Interfaces/IGraphics.cs
diff --git a/OpenSim/Region/OptionalModules/Scripting/Minimodule/IHeightmap.cs b/OpenSim/Region/OptionalModules/Scripting/Minimodule/Interfaces/IHeightmap.cs
index 93cbc5b..eea1baf 100644
--- a/OpenSim/Region/OptionalModules/Scripting/Minimodule/IHeightmap.cs
+++ b/OpenSim/Region/OptionalModules/Scripting/Minimodule/Interfaces/IHeightmap.cs
@@ -1,69 +1,69 @@
-/*
- * 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.Text;
-
-namespace OpenSim.Region.OptionalModules.Scripting.Minimodule
-{
-    public interface IHeightmap
-    {
-        /// <summary>
-        /// Returns [or sets] the heightmap value at specified coordinates.
-        /// </summary>
-        /// <param name="x">X Coordinate</param>
-        /// <param name="y">Y Coordinate</param>
-        /// <returns>A value in meters representing height. Can be negative. Value correlates with Z parameter in world coordinates</returns>
-        /// <example>
-        /// double heightVal = World.Heightmap[128,128];
-        /// World.Heightmap[128,128] *= 5.0;
-        /// World.Heightmap[128,128] = 25;
-        /// </example>
-        double this[int x, int y]
-        {
-            get;
-            set;
-        }
-
-        /// <summary>
-        /// The maximum length of the region (Y axis), exclusive. (eg Height = 256, max Y = 255). Minimum is always 0 inclusive.
-        /// </summary>
-        /// <example>
-        /// Host.Console.Info("The terrain length of this region is " + World.Heightmap.Length);
-        /// </example>
-        int Length { get; }
-
-        /// <summary>
-        /// The maximum width of the region (X axis), exclusive. (eg Width = 256, max X = 255). Minimum is always 0 inclusive.
-        /// </summary>
-        /// <example>
-        /// Host.Console.Info("The terrain width of this region is " + World.Heightmap.Width);
-        /// </example>
-        int Width { get; }
-    }
-}
+/*

+ * 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.Text;

+

+namespace OpenSim.Region.OptionalModules.Scripting.Minimodule

+{

+    public interface IHeightmap

+    {

+        /// <summary>

+        /// Returns [or sets] the heightmap value at specified coordinates.

+        /// </summary>

+        /// <param name="x">X Coordinate</param>

+        /// <param name="y">Y Coordinate</param>

+        /// <returns>A value in meters representing height. Can be negative. Value correlates with Z parameter in world coordinates</returns>

+        /// <example>

+        /// double heightVal = World.Heightmap[128,128];

+        /// World.Heightmap[128,128] *= 5.0;

+        /// World.Heightmap[128,128] = 25;

+        /// </example>

+        double this[int x, int y]

+        {

+            get;

+            set;

+        }

+

+        /// <summary>

+        /// The maximum length of the region (Y axis), exclusive. (eg Height = 256, max Y = 255). Minimum is always 0 inclusive.

+        /// </summary>

+        /// <example>

+        /// Host.Console.Info("The terrain length of this region is " + World.Heightmap.Length);

+        /// </example>

+        int Length { get; }

+

+        /// <summary>

+        /// The maximum width of the region (X axis), exclusive. (eg Width = 256, max X = 255). Minimum is always 0 inclusive.

+        /// </summary>

+        /// <example>

+        /// Host.Console.Info("The terrain width of this region is " + World.Heightmap.Width);

+        /// </example>

+        int Width { get; }

+    }

+}

diff --git a/OpenSim/Region/OptionalModules/Scripting/Minimodule/IHost.cs b/OpenSim/Region/OptionalModules/Scripting/Minimodule/Interfaces/IHost.cs
index 6c76919..8980b8f 100644
--- a/OpenSim/Region/OptionalModules/Scripting/Minimodule/IHost.cs
+++ b/OpenSim/Region/OptionalModules/Scripting/Minimodule/Interfaces/IHost.cs
@@ -1,41 +1,41 @@
-/*
- * 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.Text;
-using log4net;
-
-namespace OpenSim.Region.OptionalModules.Scripting.Minimodule
-{
-    public interface IHost
-    {
-        IObject Object { get; }
-        ILog Console { get; }
-        IGraphics Graphics { get; }
-    }
-}
+/*

+ * 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.Text;

+using log4net;

+

+namespace OpenSim.Region.OptionalModules.Scripting.Minimodule

+{

+    public interface IHost

+    {

+        IObject Object { get; }

+        ILog Console { get; }

+        IGraphics Graphics { get; }

+    }

+}

diff --git a/OpenSim/Region/OptionalModules/Scripting/Minimodule/IObject.cs b/OpenSim/Region/OptionalModules/Scripting/Minimodule/Interfaces/IObject.cs
index dc2e3fa..e17b716 100644
--- a/OpenSim/Region/OptionalModules/Scripting/Minimodule/IObject.cs
+++ b/OpenSim/Region/OptionalModules/Scripting/Minimodule/Interfaces/IObject.cs
@@ -1,223 +1,223 @@
-/*
- * 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.Drawing;
-using OpenMetaverse;
-using OpenSim.Region.OptionalModules.Scripting.Minimodule.Object;
-
-namespace OpenSim.Region.OptionalModules.Scripting.Minimodule
-{
-    public class TouchEventArgs : EventArgs
-    {
-        public IAvatar Avatar;
-
-        public Vector3 TouchBiNormal;
-        public Vector3 TouchNormal;
-        public Vector3 TouchPosition;
-
-        public Vector2 TouchUV;
-        public Vector2 TouchST;
-
-        public int TouchMaterialIndex;
-    }
-
-    public delegate void OnTouchDelegate(IObject sender, TouchEventArgs e);
-
-    public interface IObject : IEntity
-    {
-        #region Events
-
-        event OnTouchDelegate OnTouch;
-
-        #endregion
-
-        /// <summary>
-        /// Returns whether or not this object is still in the world.
-        /// Eg, if you store an IObject reference, however the object
-        /// is deleted before you use it, it will throw a NullReference 
-        /// exception. 'Exists' allows you to check the object is still
-        /// in play before utilizing it.
-        /// </summary>
-        /// <example>
-        /// IObject deleteMe = World.Objects[0];
-        /// 
-        /// if (deleteMe.Exists) {
-        ///     deleteMe.Say("Hello, I still exist!");
-        /// }
-        /// 
-        /// World.Objects.Remove(deleteMe);
-        /// 
-        /// if (!deleteMe.Exists) {
-        ///     Host.Console.Info("I was deleted");
-        /// }
-        /// </example>
-        /// <remarks>
-        /// Objects should be near-guarunteed to exist for any event which
-        /// passes them as an argument. Storing an object for a longer period
-        /// of time however will limit their reliability.
-        /// 
-        /// It is a good practice to use Try/Catch blocks handling for
-        /// NullReferenceException, when accessing remote objects.
-        /// </remarks>
-        bool Exists { get; }
-
-        /// <summary>
-        /// The local region-unique ID for this object.
-        /// </summary>
-        uint LocalID { get; }
-
-        /// <summary>
-        /// The description assigned to this object.
-        /// </summary>
-        String Description { get; set; }
-
-        /// <summary>
-        /// Returns the root object of a linkset. If this object is the root, it will return itself.
-        /// </summary>
-        IObject Root { get; }
-
-        /// <summary>
-        /// Returns a collection of objects which are linked to the current object. Does not include the root object.
-        /// </summary>
-        IObject[] Children { get; }
-
-        /// <summary>
-        /// Returns a list of materials attached to this object. Each may contain unique texture 
-        /// and other visual information. For primitive based objects, this correlates with 
-        /// Object Faces. For mesh based objects, this correlates with Materials.
-        /// </summary>
-        IObjectMaterial[] Materials { get; }
-
-        /// <summary>
-        /// The bounding box of the object. Primitive and Mesh objects alike are scaled to fit within these bounds.
-        /// </summary>
-        Vector3 Scale { get; set; }
-
-        /// <summary>
-        /// The rotation of the object relative to the Scene
-        /// </summary>
-        Quaternion WorldRotation { get; set; }
-
-        /// <summary>
-        /// The rotation of the object relative to a parent object
-        /// If root, works the same as WorldRotation
-        /// </summary>
-        Quaternion OffsetRotation { get; set; }
-
-        /// <summary>
-        /// The position of the object relative to a parent object
-        /// If root, works the same as WorldPosition
-        /// </summary>
-        Vector3 OffsetPosition { get; set; }
-
-        Vector3 SitTarget { get; set; }
-        String SitTargetText { get; set; }
-
-        String TouchText { get; set; }
-
-        /// <summary>
-        /// Text to be associated with this object, in the 
-        /// Second Life(r) viewer, this is shown above the
-        /// object.
-        /// </summary>
-        String Text { get; set; }
-
-        bool IsRotationLockedX { get; set; } // SetStatus(!ROTATE_X)
-        bool IsRotationLockedY { get; set; } // SetStatus(!ROTATE_Y)
-        bool IsRotationLockedZ { get; set; } // SetStatus(!ROTATE_Z)
-        bool IsSandboxed { get; set; } // SetStatus(SANDBOX)
-        bool IsImmotile { get; set; } // SetStatus(BLOCK_GRAB)
-        bool IsAlwaysReturned { get; set; } // SetStatus(!DIE_AT_EDGE)
-        bool IsTemporary { get; set; } // TEMP_ON_REZ
-
-        bool IsFlexible { get; set; }
-
-        PrimType PrimShape { get; set; }
-        // TODO:
-        // PrimHole
-        // Repeats, Offsets, Cut/Dimple/ProfileCut
-        // Hollow, Twist, HoleSize,
-        // Taper[A+B], Shear[A+B], Revolutions,
-        // RadiusOffset, Skew
-
-        PhysicsMaterial PhysicsMaterial { get; set; }
-
-        IObjectPhysics Physics { get; }
-
-
-        /// <summary>
-        /// Causes the object to speak to its surroundings,
-        /// equivilent to LSL/OSSL llSay
-        /// </summary>
-        /// <param name="msg">The message to send to the user</param>
-        void Say(string msg);
-
-    }
-
-    public enum PhysicsMaterial
-    {
-        Default,
-        Glass,
-        Metal,
-        Plastic,
-        Wood,
-        Rubber,
-        Stone,
-        Flesh
-    }
-
-    public enum PrimType
-    {
-        NotPrimitive = 255,
-        Box = 0,
-        Cylinder = 1,
-        Prism = 2,
-        Sphere = 3,
-        Torus = 4,
-        Tube = 5,
-        Ring = 6,
-        Sculpt = 7
-    }
-
-    public enum TextureMapping
-    {
-        Default,
-        Planar
-    }
-
-    public interface IObjectMaterial
-    {
-        Color Color { get; set; }
-        UUID Texture { get; set; }
-        TextureMapping Mapping { get; set; } // SetPrimParms(PRIM_TEXGEN)
-        bool Bright { get; set; } // SetPrimParms(FULLBRIGHT)
-        double Bloom { get; set; } // SetPrimParms(GLOW)
-        bool Shiny { get; set; } // SetPrimParms(SHINY)
-        bool BumpMap { get; set; } // SetPrimParms(BUMPMAP) [DEPRECIATE IN FAVOUR OF UUID?]
-    }
-}
+/*

+ * 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.Drawing;

+using OpenMetaverse;

+using OpenSim.Region.OptionalModules.Scripting.Minimodule.Object;

+

+namespace OpenSim.Region.OptionalModules.Scripting.Minimodule

+{

+    public class TouchEventArgs : EventArgs

+    {

+        public IAvatar Avatar;

+

+        public Vector3 TouchBiNormal;

+        public Vector3 TouchNormal;

+        public Vector3 TouchPosition;

+

+        public Vector2 TouchUV;

+        public Vector2 TouchST;

+

+        public int TouchMaterialIndex;

+    }

+

+    public delegate void OnTouchDelegate(IObject sender, TouchEventArgs e);

+

+    public interface IObject : IEntity

+    {

+        #region Events

+

+        event OnTouchDelegate OnTouch;

+

+        #endregion

+

+        /// <summary>

+        /// Returns whether or not this object is still in the world.

+        /// Eg, if you store an IObject reference, however the object

+        /// is deleted before you use it, it will throw a NullReference 

+        /// exception. 'Exists' allows you to check the object is still

+        /// in play before utilizing it.

+        /// </summary>

+        /// <example>

+        /// IObject deleteMe = World.Objects[0];

+        /// 

+        /// if (deleteMe.Exists) {

+        ///     deleteMe.Say("Hello, I still exist!");

+        /// }

+        /// 

+        /// World.Objects.Remove(deleteMe);

+        /// 

+        /// if (!deleteMe.Exists) {

+        ///     Host.Console.Info("I was deleted");

+        /// }

+        /// </example>

+        /// <remarks>

+        /// Objects should be near-guarunteed to exist for any event which

+        /// passes them as an argument. Storing an object for a longer period

+        /// of time however will limit their reliability.

+        /// 

+        /// It is a good practice to use Try/Catch blocks handling for

+        /// NullReferenceException, when accessing remote objects.

+        /// </remarks>

+        bool Exists { get; }

+

+        /// <summary>

+        /// The local region-unique ID for this object.

+        /// </summary>

+        uint LocalID { get; }

+

+        /// <summary>

+        /// The description assigned to this object.

+        /// </summary>

+        String Description { get; set; }

+

+        /// <summary>

+        /// Returns the root object of a linkset. If this object is the root, it will return itself.

+        /// </summary>

+        IObject Root { get; }

+

+        /// <summary>

+        /// Returns a collection of objects which are linked to the current object. Does not include the root object.

+        /// </summary>

+        IObject[] Children { get; }

+

+        /// <summary>

+        /// Returns a list of materials attached to this object. Each may contain unique texture 

+        /// and other visual information. For primitive based objects, this correlates with 

+        /// Object Faces. For mesh based objects, this correlates with Materials.

+        /// </summary>

+        IObjectMaterial[] Materials { get; }

+

+        /// <summary>

+        /// The bounding box of the object. Primitive and Mesh objects alike are scaled to fit within these bounds.

+        /// </summary>

+        Vector3 Scale { get; set; }

+

+        /// <summary>

+        /// The rotation of the object relative to the Scene

+        /// </summary>

+        Quaternion WorldRotation { get; set; }

+

+        /// <summary>

+        /// The rotation of the object relative to a parent object

+        /// If root, works the same as WorldRotation

+        /// </summary>

+        Quaternion OffsetRotation { get; set; }

+

+        /// <summary>

+        /// The position of the object relative to a parent object

+        /// If root, works the same as WorldPosition

+        /// </summary>

+        Vector3 OffsetPosition { get; set; }

+

+        Vector3 SitTarget { get; set; }

+        String SitTargetText { get; set; }

+

+        String TouchText { get; set; }

+

+        /// <summary>

+        /// Text to be associated with this object, in the 

+        /// Second Life(r) viewer, this is shown above the

+        /// object.

+        /// </summary>

+        String Text { get; set; }

+

+        bool IsRotationLockedX { get; set; } // SetStatus(!ROTATE_X)

+        bool IsRotationLockedY { get; set; } // SetStatus(!ROTATE_Y)

+        bool IsRotationLockedZ { get; set; } // SetStatus(!ROTATE_Z)

+        bool IsSandboxed { get; set; } // SetStatus(SANDBOX)

+        bool IsImmotile { get; set; } // SetStatus(BLOCK_GRAB)

+        bool IsAlwaysReturned { get; set; } // SetStatus(!DIE_AT_EDGE)

+        bool IsTemporary { get; set; } // TEMP_ON_REZ

+

+        bool IsFlexible { get; set; }

+

+        PrimType PrimShape { get; set; }

+        // TODO:

+        // PrimHole

+        // Repeats, Offsets, Cut/Dimple/ProfileCut

+        // Hollow, Twist, HoleSize,

+        // Taper[A+B], Shear[A+B], Revolutions,

+        // RadiusOffset, Skew

+

+        PhysicsMaterial PhysicsMaterial { get; set; }

+

+        IObjectPhysics Physics { get; }

+

+

+        /// <summary>

+        /// Causes the object to speak to its surroundings,

+        /// equivilent to LSL/OSSL llSay

+        /// </summary>

+        /// <param name="msg">The message to send to the user</param>

+        void Say(string msg);

+

+    }

+

+    public enum PhysicsMaterial

+    {

+        Default,

+        Glass,

+        Metal,

+        Plastic,

+        Wood,

+        Rubber,

+        Stone,

+        Flesh

+    }

+

+    public enum PrimType

+    {

+        NotPrimitive = 255,

+        Box = 0,

+        Cylinder = 1,

+        Prism = 2,

+        Sphere = 3,

+        Torus = 4,

+        Tube = 5,

+        Ring = 6,

+        Sculpt = 7

+    }

+

+    public enum TextureMapping

+    {

+        Default,

+        Planar

+    }

+

+    public interface IObjectMaterial

+    {

+        Color Color { get; set; }

+        UUID Texture { get; set; }

+        TextureMapping Mapping { get; set; } // SetPrimParms(PRIM_TEXGEN)

+        bool Bright { get; set; } // SetPrimParms(FULLBRIGHT)

+        double Bloom { get; set; } // SetPrimParms(GLOW)

+        bool Shiny { get; set; } // SetPrimParms(SHINY)

+        bool BumpMap { get; set; } // SetPrimParms(BUMPMAP) [DEPRECIATE IN FAVOUR OF UUID?]

+    }

+}

diff --git a/OpenSim/Region/OptionalModules/Scripting/Minimodule/IObjectAccessor.cs b/OpenSim/Region/OptionalModules/Scripting/Minimodule/Interfaces/IObjectAccessor.cs
index 7aed41b..cd27a6a 100644
--- a/OpenSim/Region/OptionalModules/Scripting/Minimodule/IObjectAccessor.cs
+++ b/OpenSim/Region/OptionalModules/Scripting/Minimodule/Interfaces/IObjectAccessor.cs
@@ -1,39 +1,39 @@
-/*
- * 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.Collections.Generic;
-using OpenMetaverse;
-
-namespace OpenSim.Region.OptionalModules.Scripting.Minimodule
-{
-    public interface IObjectAccessor : ICollection<IObject>
-    {
-        IObject this[int index] { get; }
-        IObject this[uint index] { get; }
-        IObject this[UUID index] { get; }
-    }
+/*

+ * 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.Collections.Generic;

+using OpenMetaverse;

+

+namespace OpenSim.Region.OptionalModules.Scripting.Minimodule

+{

+    public interface IObjectAccessor : ICollection<IObject>

+    {

+        IObject this[int index] { get; }

+        IObject this[uint index] { get; }

+        IObject this[UUID index] { get; }

+    }

 }
\ No newline at end of file
diff --git a/OpenSim/Region/OptionalModules/Scripting/Minimodule/IParcel.cs b/OpenSim/Region/OptionalModules/Scripting/Minimodule/Interfaces/IParcel.cs
index 759b26d..3b229a7 100644
--- a/OpenSim/Region/OptionalModules/Scripting/Minimodule/IParcel.cs
+++ b/OpenSim/Region/OptionalModules/Scripting/Minimodule/Interfaces/IParcel.cs
@@ -1,42 +1,42 @@
-/*
- * 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.Text;
-using OpenMetaverse;
-
-namespace OpenSim.Region.OptionalModules.Scripting.Minimodule
-{
-    public interface IParcel
-    {
-        string Name { get; set; }
-        string Description { get; set; }
-        ISocialEntity Owner { get; set; }
-        bool[,] Bitmap { get; }
-    }
-}
+/*

+ * 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.Text;

+using OpenMetaverse;

+

+namespace OpenSim.Region.OptionalModules.Scripting.Minimodule

+{

+    public interface IParcel

+    {

+        string Name { get; set; }

+        string Description { get; set; }

+        ISocialEntity Owner { get; set; }

+        bool[,] Bitmap { get; }

+    }

+}

diff --git a/OpenSim/Region/OptionalModules/Scripting/Minimodule/IPersistence.cs b/OpenSim/Region/OptionalModules/Scripting/Minimodule/Interfaces/IPersistence.cs
index 17bb6e7..bde51fe 100644
--- a/OpenSim/Region/OptionalModules/Scripting/Minimodule/IPersistence.cs
+++ b/OpenSim/Region/OptionalModules/Scripting/Minimodule/Interfaces/IPersistence.cs
@@ -1,56 +1,56 @@
-/*
- * 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.Text;
-
-namespace OpenSim.Region.OptionalModules.Scripting.Minimodule
-{
-    interface IPersistence
-    {
-        T Get<T>(Guid storageID);
-        T Get<T>();
-
-        /// <summary>
-        /// Stores 'data' into the persistence system
-        /// associated with this object, however saved
-        /// under the ID 'storageID'. This data may
-        /// be accessed by other scripts however.
-        /// </summary>
-        /// <param name="storageID"></param>
-        /// <param name="data"></param>
-        void Put<T>(Guid storageID, T data);
-
-        /// <summary>
-        /// Stores 'data' into the persistence system
-        /// using the default ID for this script.
-        /// </summary>
-        /// <param name="data"></param>
-        void Put<T>(T data);
-    }
-}
+/*

+ * 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.Text;

+

+namespace OpenSim.Region.OptionalModules.Scripting.Minimodule

+{

+    interface IPersistence

+    {

+        T Get<T>(Guid storageID);

+        T Get<T>();

+

+        /// <summary>

+        /// Stores 'data' into the persistence system

+        /// associated with this object, however saved

+        /// under the ID 'storageID'. This data may

+        /// be accessed by other scripts however.

+        /// </summary>

+        /// <param name="storageID"></param>

+        /// <param name="data"></param>

+        void Put<T>(Guid storageID, T data);

+

+        /// <summary>

+        /// Stores 'data' into the persistence system

+        /// using the default ID for this script.

+        /// </summary>

+        /// <param name="data"></param>

+        void Put<T>(T data);

+    }

+}

diff --git a/OpenSim/Region/OptionalModules/Scripting/Minimodule/Interfaces/IScheduler.cs b/OpenSim/Region/OptionalModules/Scripting/Minimodule/Interfaces/IScheduler.cs
new file mode 100644
index 0000000..cf45de7
--- /dev/null
+++ b/OpenSim/Region/OptionalModules/Scripting/Minimodule/Interfaces/IScheduler.cs
@@ -0,0 +1,43 @@
+using System;

+

+namespace OpenSim.Region.OptionalModules.Scripting.Minimodule

+{

+    interface IScheduler

+    {

+        /// <summary>

+        /// Schedule an event callback to occur

+        /// when 'time' is elapsed.

+        /// </summary>

+        /// <param name="time">The period to wait before executing</param>

+        void RunIn(TimeSpan time);

+

+        /// <summary>

+        /// Schedule an event callback to fire

+        /// every "time". Equivilent to a repeating

+        /// timer.

+        /// </summary>

+        /// <param name="time">The period to wait between executions</param>

+        void RunAndRepeat(TimeSpan time);

+

+        /// <summary>

+        /// Fire this scheduler only when the region has

+        /// a user in it.

+        /// </summary>

+        bool WhenRegionOccupied { get; set; }

+

+        /// <summary>

+        /// Fire this event only when the region is visible

+        /// to a child agent, or there is a full agent

+        /// in this region.

+        /// </summary>

+        bool WhenRegionVisible { get; set; }

+

+        /// <summary>

+        /// Determines whether this runs in the master scheduler thread, or a new thread

+        /// is spawned to handle your request. Running in scheduler may mean that your

+        /// code does not execute perfectly on time, however will result in a lower

+        /// processor cost to running your code.

+        /// </summary>

+        bool Schedule { get; set; }

+    }

+}

diff --git a/OpenSim/Region/OptionalModules/Scripting/Minimodule/ISocialEntity.cs b/OpenSim/Region/OptionalModules/Scripting/Minimodule/Interfaces/ISocialEntity.cs
index 400367f..cbac123 100644
--- a/OpenSim/Region/OptionalModules/Scripting/Minimodule/ISocialEntity.cs
+++ b/OpenSim/Region/OptionalModules/Scripting/Minimodule/Interfaces/ISocialEntity.cs
@@ -1,41 +1,41 @@
-/*
- * 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.Text;
-using OpenMetaverse;
-
-namespace OpenSim.Region.OptionalModules.Scripting.Minimodule
-{
-    public interface ISocialEntity
-    {
-        UUID GlobalID { get; }
-        string Name { get; }
-        bool IsUser { get; }
-    }
+/*

+ * 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.Text;

+using OpenMetaverse;

+

+namespace OpenSim.Region.OptionalModules.Scripting.Minimodule

+{

+    public interface ISocialEntity

+    {

+        UUID GlobalID { get; }

+        string Name { get; }

+        bool IsUser { get; }

+    }

 }
\ No newline at end of file
diff --git a/OpenSim/Region/OptionalModules/Scripting/Minimodule/IWorld.cs b/OpenSim/Region/OptionalModules/Scripting/Minimodule/Interfaces/IWorld.cs
index acb569f..9196acd 100644
--- a/OpenSim/Region/OptionalModules/Scripting/Minimodule/IWorld.cs
+++ b/OpenSim/Region/OptionalModules/Scripting/Minimodule/Interfaces/IWorld.cs
@@ -1,57 +1,57 @@
-/*
- * 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;
-
-namespace OpenSim.Region.OptionalModules.Scripting.Minimodule
-{
-    public class NewUserEventArgs : EventArgs
-    {
-        public IAvatar Avatar;
-    }
-
-    public delegate void OnNewUserDelegate(IWorld sender, NewUserEventArgs e);
-
-    public class ChatEventArgs : EventArgs
-    {
-        public string Text;
-        public IEntity Sender;
-    }
-
-    public delegate void OnChatDelegate(IWorld sender, ChatEventArgs e);
-
-    public interface IWorld
-    {
-        IObjectAccessor Objects { get; }
-        IAvatar[] Avatars { get; }
-        IParcel[] Parcels { get; }
-        IHeightmap Terrain { get; }
-
-        event OnChatDelegate OnChat;
-        event OnNewUserDelegate OnNewUser;
-    }
-}
+/*

+ * 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;

+

+namespace OpenSim.Region.OptionalModules.Scripting.Minimodule

+{

+    public class NewUserEventArgs : EventArgs

+    {

+        public IAvatar Avatar;

+    }

+

+    public delegate void OnNewUserDelegate(IWorld sender, NewUserEventArgs e);

+

+    public class ChatEventArgs : EventArgs

+    {

+        public string Text;

+        public IEntity Sender;

+    }

+

+    public delegate void OnChatDelegate(IWorld sender, ChatEventArgs e);

+

+    public interface IWorld

+    {

+        IObjectAccessor Objects { get; }

+        IAvatar[] Avatars { get; }

+        IParcel[] Parcels { get; }

+        IHeightmap Terrain { get; }

+

+        event OnChatDelegate OnChat;

+        event OnNewUserDelegate OnNewUser;

+    }

+}

diff --git a/OpenSim/Region/OptionalModules/Scripting/Minimodule/SOPObjectMaterial.cs b/OpenSim/Region/OptionalModules/Scripting/Minimodule/SOPObjectMaterial.cs
index 94de09e..57d84e1 100644
--- a/OpenSim/Region/OptionalModules/Scripting/Minimodule/SOPObjectMaterial.cs
+++ b/OpenSim/Region/OptionalModules/Scripting/Minimodule/SOPObjectMaterial.cs
@@ -1,7 +1,4 @@
-using System;

-using System.Collections.Generic;

-using System.Drawing;

-using System.Text;

+using System.Drawing;

 using OpenMetaverse;

 using OpenSim.Region.Framework.Scenes;

 

diff --git a/OpenSim/Region/OptionalModules/Scripting/Minimodule/Test/DrunkenTextAppreciationModule.cs b/OpenSim/Region/OptionalModules/Scripting/Minimodule/Test/DrunkenTextAppreciationModule.cs
index 7e8db9c..755831c 100644
--- a/OpenSim/Region/OptionalModules/Scripting/Minimodule/Test/DrunkenTextAppreciationModule.cs
+++ b/OpenSim/Region/OptionalModules/Scripting/Minimodule/Test/DrunkenTextAppreciationModule.cs
@@ -38,13 +38,21 @@ namespace OpenSim
 

         void World_OnChat(IWorld sender, ChatEventArgs e)

         {

-            if(!e.Text.Contains("hic!"))

+            if (e.Sender is IAvatar)

             {

-                e.Text = e.Text.Replace("s", "sh");

-                e.Text = e.Text.Replace("S", "Sh");

-                e.Text += " ...hic!";

+                if (!e.Text.Contains("hic!"))

+                {

+                    e.Text = e.Text.Replace("s", "sh");

+                    e.Text = e.Text.Replace("S", "Sh");

+                    e.Text += " ...hic!";

 

-                Host.Object.Say(e.Text);

+                    Host.Object.Say(e.Text);

+                }

+            }

+

+            if(e.Sender is IObject)

+            {

+                // Ignore

             }

         }