33 files changed, 486 insertions, 211 deletions
diff --git a/OpenSim/Client/MXP/ClientStack/MXPClientView.cs b/OpenSim/Client/MXP/ClientStack/MXPClientView.cs
index a7bcc07..104f2d5 100644
--- a/OpenSim/Client/MXP/ClientStack/MXPClientView.cs
+++ b/OpenSim/Client/MXP/ClientStack/MXPClientView.cs
@@ -612,6 +612,7 @@ namespace OpenSim.Client.MXP.ClientStack
        public event SpinStop OnSpinStop;
        public event UpdateShape OnUpdatePrimShape;
        public event ObjectExtraParams OnUpdateExtraParams;
+        public event ObjectRequest OnObjectRequest;
        public event ObjectSelect OnObjectSelect;
        public event ObjectDeselect OnObjectDeselect;
        public event GenericCall7 OnObjectDescription;
diff --git a/OpenSim/Client/VWoHTTP/ClientStack/VWHClientView.cs b/OpenSim/Client/VWoHTTP/ClientStack/VWHClientView.cs
index 324b5af..bfca954 100644
--- a/OpenSim/Client/VWoHTTP/ClientStack/VWHClientView.cs
+++ b/OpenSim/Client/VWoHTTP/ClientStack/VWHClientView.cs
@@ -259,6 +259,7 @@ namespace OpenSim.Client.VWoHTTP.ClientStack
        public event SpinStop OnSpinStop = delegate { };
        public event UpdateShape OnUpdatePrimShape = delegate { };
        public event ObjectExtraParams OnUpdateExtraParams = delegate { };
+        public event ObjectRequest OnObjectRequest = delegate { };
        public event ObjectSelect OnObjectSelect = delegate { };
        public event ObjectDeselect OnObjectDeselect = delegate { };
        public event GenericCall7 OnObjectDescription = delegate { };
diff --git a/OpenSim/Data/Tests/PropertyCompareConstraint.cs b/OpenSim/Data/Tests/PropertyCompareConstraint.cs
index 678501e..063267b 100644
--- a/OpenSim/Data/Tests/PropertyCompareConstraint.cs
+++ b/OpenSim/Data/Tests/PropertyCompareConstraint.cs
@@ -1,3 +1,30 @@
+/*
+ * 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;
@@ -52,7 +79,7 @@ namespace OpenSim.Data.Tests
                return false;
            }
-            if(actual.GetType() == typeof(Color))
+            if (actual.GetType() == typeof(Color))
            {
                Color actualColor = (Color) actual;
                Color expectedColor = (Color) expected;
diff --git a/OpenSim/Data/Tests/ScrambleForTesting.cs b/OpenSim/Data/Tests/ScrambleForTesting.cs
index c6e467f..3a22347 100644
--- a/OpenSim/Data/Tests/ScrambleForTesting.cs
+++ b/OpenSim/Data/Tests/ScrambleForTesting.cs
@@ -1,3 +1,30 @@
+/*
+ * 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.Reflection;
@@ -18,7 +45,7 @@ namespace OpenSim.Data.Tests
            {
                //Skip indexers of classes.  We will assume that everything that has an indexer
                //  is also IEnumberable.  May not always be true, but should be true normally.
-                if(property.GetIndexParameters().Length > 0)
+                if (property.GetIndexParameters().Length > 0)
                    continue;
                RandomizeProperty(obj, property, null);
@@ -26,7 +53,7 @@ namespace OpenSim.Data.Tests
            //Now if it implments IEnumberable, it's probably some kind of list, so we should randomize
            //  everything inside of it.
            IEnumerable enumerable = obj as IEnumerable;
-            if(enumerable != null)
+            if (enumerable != null)
            {
                foreach (object value in enumerable)
                {
diff --git a/OpenSim/Framework/IClientAPI.cs b/OpenSim/Framework/IClientAPI.cs
index 1594c44..e451dd8 100644
--- a/OpenSim/Framework/IClientAPI.cs
+++ b/OpenSim/Framework/IClientAPI.cs
@@ -111,6 +111,8 @@ namespace OpenSim.Framework
    public delegate void ObjectSelect(uint localID, IClientAPI remoteClient);
+    public delegate void ObjectRequest(uint localID, IClientAPI remoteClient);
    public delegate void RequestObjectPropertiesFamily(
        IClientAPI remoteClient, UUID AgentID, uint RequestFlags, UUID TaskID);
@@ -622,6 +624,7 @@ namespace OpenSim.Framework
        event UpdateShape OnUpdatePrimShape;
        event ObjectExtraParams OnUpdateExtraParams;
+        event ObjectRequest OnObjectRequest;
        event ObjectSelect OnObjectSelect;
        event ObjectDeselect OnObjectDeselect;
        event GenericCall7 OnObjectDescription;
diff --git a/OpenSim/Framework/LandData.cs b/OpenSim/Framework/LandData.cs
index a24af04..e639da0 100644
--- a/OpenSim/Framework/LandData.cs
+++ b/OpenSim/Framework/LandData.cs
@@ -520,7 +520,7 @@ namespace OpenSim.Framework
        }
        /// <summary>
-        /// Depreciated idea.   Number of visitors ~= free money
+        /// Deprecated idea.  Number of visitors ~= free money
        /// </summary>
        public int Dwell {
            get {
diff --git a/OpenSim/Framework/Tests/AgentCircuitManagerTests.cs b/OpenSim/Framework/Tests/AgentCircuitManagerTests.cs
index ab5f04a..6c98897 100644
--- a/OpenSim/Framework/Tests/AgentCircuitManagerTests.cs
+++ b/OpenSim/Framework/Tests/AgentCircuitManagerTests.cs
@@ -64,7 +64,7 @@ namespace OpenSim.Framework.Tests
            Vector3 StartPos = new Vector3(5, 23, 125);
            UUID SecureSessionId = UUID.Random();
-            UUID SessionId = UUID.Random();
+            // TODO: unused: UUID SessionId = UUID.Random();
            m_agentCircuitData1 = new AgentCircuitData();
            m_agentCircuitData1.AgentID = AgentId1;
diff --git a/OpenSim/Framework/Tests/ThreadTrackerTests.cs b/OpenSim/Framework/Tests/ThreadTrackerTests.cs
index 37c75ef..15d5b73 100644
--- a/OpenSim/Framework/Tests/ThreadTrackerTests.cs
+++ b/OpenSim/Framework/Tests/ThreadTrackerTests.cs
@@ -161,7 +161,7 @@ namespace OpenSim.Framework.Tests
        /// Worker thread 0
        /// </summary>
        /// <param name="o"></param>
-        public void run( object o)
+        public void run(object o)
        {
            while (running)
            {
diff --git a/OpenSim/Region/ClientStack/LindenUDP/LLClientView.cs b/OpenSim/Region/ClientStack/LindenUDP/LLClientView.cs
index 7633b7b..12c2d86 100644
--- a/OpenSim/Region/ClientStack/LindenUDP/LLClientView.cs
+++ b/OpenSim/Region/ClientStack/LindenUDP/LLClientView.cs
@@ -197,6 +197,7 @@ namespace OpenSim.Region.ClientStack.LindenUDP
        private ObjectExtraParams handlerUpdateExtraParams; //OnUpdateExtraParams;
        private ObjectDuplicate handlerObjectDuplicate;
        private ObjectDuplicateOnRay handlerObjectDuplicateOnRay;
+        private ObjectRequest handlerObjectRequest;
        private ObjectSelect handlerObjectSelect;
        private ObjectDeselect handlerObjectDeselect;
        private ObjectIncludeInSearch handlerObjectIncludeInSearch;
@@ -1083,6 +1084,7 @@ namespace OpenSim.Region.ClientStack.LindenUDP
        public event GodKickUser OnGodKickUser;
        public event ObjectExtraParams OnUpdateExtraParams;
        public event UpdateShape OnUpdatePrimShape;
+        public event ObjectRequest OnObjectRequest;
        public event ObjectSelect OnObjectSelect;
        public event ObjectDeselect OnObjectDeselect;
        public event GenericCall7 OnObjectDescription;
@@ -5937,6 +5939,29 @@ namespace OpenSim.Region.ClientStack.LindenUDP
                    break;
+                case PacketType.RequestMultipleObjects:
+                    RequestMultipleObjectsPacket incomingRequest = (RequestMultipleObjectsPacket)Pack;
+                    #region Packet Session and User Check
+                    if (m_checkPackets)
+                    {
+                        if (incomingRequest.AgentData.SessionID != SessionId ||
+                            incomingRequest.AgentData.AgentID != AgentId)
+                            break;
+                    }
+                    #endregion
+                    handlerObjectRequest = null;
+                    for (int i = 0; i < incomingRequest.ObjectData.Length; i++)
+                    {
+                        handlerObjectRequest = OnObjectRequest;
+                        if (handlerObjectRequest != null)
+                        {
+                            handlerObjectRequest(incomingRequest.ObjectData[i].ID, this);
+                        }
+                    }
+                    break;
                case PacketType.ObjectSelect:
                    ObjectSelectPacket incomingselect = (ObjectSelectPacket)Pack;
diff --git a/OpenSim/Region/CoreModules/InterGrid/OpenGridProtocolModule.cs b/OpenSim/Region/CoreModules/InterGrid/OpenGridProtocolModule.cs
index bcf20be..e9c1e9d 100644
--- a/OpenSim/Region/CoreModules/InterGrid/OpenGridProtocolModule.cs
+++ b/OpenSim/Region/CoreModules/InterGrid/OpenGridProtocolModule.cs
@@ -450,7 +450,7 @@ namespace OpenSim.Region.CoreModules.InterGrid
            responseMap["sim_host"] = OSD.FromString(reg.ExternalHostName);
            
-            // DEPRECIATED
+            // DEPRECATED
            responseMap["sim_ip"] = OSD.FromString(Util.GetHostFromDNS(reg.ExternalHostName).ToString());
            
            responseMap["connect"] = OSD.FromBoolean(true);
@@ -591,7 +591,7 @@ namespace OpenSim.Region.CoreModules.InterGrid
                    httpaddr = httpsCN;
            }
            
-            // DEPRECIATED
+            // DEPRECATED
            responseMap["seed_capability"] 
                = OSD.FromString(
                    regionCapsHttpProtocol + httpaddr + ":" + reg.HttpPort + CapsUtil.GetCapsSeedPath(userCap.CapsObjectPath));
@@ -764,7 +764,7 @@ namespace OpenSim.Region.CoreModules.InterGrid
                    responseMap["sim_port"] = OSD.FromInteger(reg.InternalEndPoint.Port);
                    responseMap["sim_host"] = OSD.FromString(reg.ExternalHostName);// + ":" + reg.InternalEndPoint.Port.ToString());
                    
-                    // DEPRECIATED
+                    // DEPRECATED
                    responseMap["sim_ip"] = OSD.FromString(Util.GetHostFromDNS(reg.ExternalHostName).ToString());
                    responseMap["session_id"] = OSD.FromUUID(SessionID);
@@ -851,7 +851,7 @@ namespace OpenSim.Region.CoreModules.InterGrid
                    string rezRespSeedCap = "";
-                    // DEPRECIATED
+                    // DEPRECATED
                    if (rezResponseMap.ContainsKey("seed_capability"))
                        rezRespSeedCap = rezResponseMap["seed_capability"].AsString();
                    
@@ -863,7 +863,7 @@ namespace OpenSim.Region.CoreModules.InterGrid
                    if (rezResponseMap.ContainsKey("rez_avatar/rez"))
                        rezRespSeedCap = rezResponseMap["rez_avatar/rez"].AsString();
-                    // DEPRECIATED
+                    // DEPRECATED
                    string rezRespSim_ip = rezResponseMap["sim_ip"].AsString();
                    
                    string rezRespSim_host = rezResponseMap["sim_host"].AsString();
@@ -879,13 +879,13 @@ namespace OpenSim.Region.CoreModules.InterGrid
                    {
                        RezResponsePositionArray = (OSDArray)rezResponseMap["position"];
                    }
-                    // DEPRECIATED
+                    // DEPRECATED
                    responseMap["seed_capability"] = OSD.FromString(rezRespSeedCap);
                    
                    // REPLACEMENT r3
                    responseMap["region_seed_capability"] = OSD.FromString(rezRespSeedCap);
-                    // DEPRECIATED
+                    // DEPRECATED
                    responseMap["sim_ip"] = OSD.FromString(Util.GetHostFromDNS(rezRespSim_ip).ToString());
                    
                    responseMap["sim_host"] = OSD.FromString(rezRespSim_host);
diff --git a/OpenSim/Region/Examples/SimpleModule/MyNpcCharacter.cs b/OpenSim/Region/Examples/SimpleModule/MyNpcCharacter.cs
index 62779e7..e9c35e9 100644
--- a/OpenSim/Region/Examples/SimpleModule/MyNpcCharacter.cs
+++ b/OpenSim/Region/Examples/SimpleModule/MyNpcCharacter.cs
@@ -107,6 +107,7 @@ namespace OpenSim.Region.Examples.SimpleModule
        public event UpdateShape OnUpdatePrimShape;
        public event ObjectExtraParams OnUpdateExtraParams;
        public event RequestObjectPropertiesFamily OnRequestObjectPropertiesFamily;
+        public event ObjectRequest OnObjectRequest;
        public event ObjectSelect OnObjectSelect;
        public event GenericCall7 OnObjectDescription;
        public event GenericCall7 OnObjectName;
diff --git a/OpenSim/Region/Framework/Scenes/EventManager.cs b/OpenSim/Region/Framework/Scenes/EventManager.cs
index 7bbe045..287d8d9 100644
--- a/OpenSim/Region/Framework/Scenes/EventManager.cs
+++ b/OpenSim/Region/Framework/Scenes/EventManager.cs
@@ -63,7 +63,7 @@ namespace OpenSim.Region.Framework.Scenes
        public delegate void OnNewClientDelegate(IClientAPI client);
        /// <summary>
-        /// Depreciated in favour of OnClientConnect.
+        /// Deprecated in favour of OnClientConnect.
        /// Will be marked Obsolete after IClientCore has 100% of IClientAPI interfaces.
        /// </summary>
        public event OnNewClientDelegate OnNewClient;
diff --git a/OpenSim/Region/Framework/Scenes/Scene.PacketHandlers.cs b/OpenSim/Region/Framework/Scenes/Scene.PacketHandlers.cs
index 113918d..1a7f8f8 100644
--- a/OpenSim/Region/Framework/Scenes/Scene.PacketHandlers.cs
+++ b/OpenSim/Region/Framework/Scenes/Scene.PacketHandlers.cs
@@ -109,6 +109,29 @@ namespace OpenSim.Region.Framework.Scenes
        }
        /// <summary>
+        /// Invoked when the client requests a prim.
+        /// </summary>
+        /// <param name="primLocalID"></param>
+        /// <param name="remoteClient"></param>
+        public void RequestPrim(uint primLocalID, IClientAPI remoteClient)
+        {
+            PacketType i = PacketType.ObjectUpdate;
+            List<EntityBase> EntityList = GetEntities();
+            foreach (EntityBase ent in EntityList)
+            {
+                if (ent is SceneObjectGroup)
+                {
+                    if (((SceneObjectGroup)ent).LocalId == primLocalID)
+                    {
+                        ((SceneObjectGroup)ent).SendFullUpdateToClient(remoteClient);
+                        return;
+                    }
+                }
+            }
+        }
+        /// <summary>
        /// Invoked when the client selects a prim.
        /// </summary>
        /// <param name="primLocalID"></param>
diff --git a/OpenSim/Region/Framework/Scenes/Scene.cs b/OpenSim/Region/Framework/Scenes/Scene.cs
index 18d7bad..a2275f8 100644
--- a/OpenSim/Region/Framework/Scenes/Scene.cs
+++ b/OpenSim/Region/Framework/Scenes/Scene.cs
@@ -2076,6 +2076,7 @@ namespace OpenSim.Region.Framework.Scenes
            client.OnUpdatePrimTexture += m_sceneGraph.UpdatePrimTexture;
            client.OnTeleportLocationRequest += RequestTeleportLocation;
            client.OnTeleportLandmarkRequest += RequestTeleportLandmark;
+            client.OnObjectRequest += RequestPrim;
            client.OnObjectSelect += SelectPrim;
            client.OnObjectDeselect += DeselectPrim;
            client.OnGrabUpdate += m_sceneGraph.MoveObject;
diff --git a/OpenSim/Region/Framework/Scenes/SceneGraph.cs b/OpenSim/Region/Framework/Scenes/SceneGraph.cs
index 0e0999a..7771831 100644
--- a/OpenSim/Region/Framework/Scenes/SceneGraph.cs
+++ b/OpenSim/Region/Framework/Scenes/SceneGraph.cs
@@ -928,25 +928,22 @@ namespace OpenSim.Region.Framework.Scenes
        {
            // Primitive Ray Tracing
            float closestDistance = 280f;
-            EntityIntersection returnResult = new EntityIntersection();
+            EntityIntersection result = new EntityIntersection();
            List<EntityBase> EntityList = GetEntities();
            foreach (EntityBase ent in EntityList)
            {
                if (ent is SceneObjectGroup)
                {
                    SceneObjectGroup reportingG = (SceneObjectGroup)ent;
-                    EntityIntersection result = reportingG.TestIntersection(hray, frontFacesOnly, faceCenters);
+                    EntityIntersection inter = reportingG.TestIntersection(hray, frontFacesOnly, faceCenters);
-                    if (result.HitTF)
+                    if (inter.HitTF && inter.distance < closestDistance)
                    {
-                        if (result.distance < closestDistance)
+                        closestDistance = inter.distance;
-                        {
+                        result = inter;
-                            closestDistance = result.distance;
-                            returnResult = result;
-                        }
                    }
                }
            }
-            return returnResult;
+            return result;
        }
        /// <summary>
@@ -979,7 +976,7 @@ namespace OpenSim.Region.Framework.Scenes
                {
                    foreach (SceneObjectPart p in ((SceneObjectGroup) ent).GetParts())
                    {
-                        if (p.Name==name)
+                        if (p.Name == name)
                        {
                            return p;
                        }
diff --git a/OpenSim/Region/Framework/Scenes/SceneObjectGroup.cs b/OpenSim/Region/Framework/Scenes/SceneObjectGroup.cs
index c86e4a1..bc3d5c0 100644
--- a/OpenSim/Region/Framework/Scenes/SceneObjectGroup.cs
+++ b/OpenSim/Region/Framework/Scenes/SceneObjectGroup.cs
@@ -555,7 +555,7 @@ namespace OpenSim.Region.Framework.Scenes
            // If we get a result, we're going to find the closest result to the origin of the ray
            // and send back the intersection information back to the innerscene.
-            EntityIntersection returnresult = new EntityIntersection();
+            EntityIntersection result = new EntityIntersection();
            lock (m_parts)
            {
@@ -576,26 +576,23 @@ namespace OpenSim.Region.Framework.Scenes
                    // when the camera crosses the border.
                    float idist = Constants.RegionSize;
                    if (inter.HitTF)
                    {
                        // We need to find the closest prim to return to the testcaller along the ray
                        if (inter.distance < idist)
                        {
-                            returnresult.HitTF = true;
+                            result.HitTF = true;
-                            returnresult.ipoint = inter.ipoint;
+                            result.ipoint = inter.ipoint;
-                            returnresult.obj = part;
+                            result.obj = part;
-                            returnresult.normal = inter.normal;
+                            result.normal = inter.normal;
-                            returnresult.distance = inter.distance;
+                            result.distance = inter.distance;
                        }
                    }
                }
            }
-            return returnresult;
+            return result;
        }
        /// <summary>
        /// Gets a vector representing the size of the bounding box containing all the prims in the group
        /// Treats all prims as rectangular, so no shape (cut etc) is taken into account
@@ -652,7 +649,6 @@ namespace OpenSim.Region.Framework.Scenes
                    frontBottomRight.Y = orig.Y + (part.Scale.Y / 2);
                    frontBottomRight.Z = orig.Z - (part.Scale.Z / 2);
                    backTopLeft.X = orig.X + (part.Scale.X / 2);
                    backTopLeft.Y = orig.Y - (part.Scale.Y / 2);
                    backTopLeft.Z = orig.Z + (part.Scale.Z / 2);
@@ -839,7 +835,6 @@ namespace OpenSim.Region.Framework.Scenes
                    if (backBottomLeft.Z < minZ)
                        minZ = backBottomLeft.Z;
                }
            }
            Vector3 boundingBox = new Vector3(maxX - minX, maxY - minY, maxZ - minZ);
@@ -860,6 +855,7 @@ namespace OpenSim.Region.Framework.Scenes
           // m_log.InfoFormat("BoundingBox is {0} , {1} , {2} ", boundingBox.X, boundingBox.Y, boundingBox.Z);
            return boundingBox;
        }
        #endregion
        public void SaveScriptedState(XmlTextWriter writer)
@@ -1029,8 +1025,8 @@ namespace OpenSim.Region.Framework.Scenes
            //m_rootPart.ApplyPhysics(m_rootPart.GetEffectiveObjectFlags(), m_scene.m_physicalPrim);
            //AttachToBackup();
            //m_rootPart.ScheduleFullUpdate();
        }
        /// <summary>
        ///
        /// </summary>
@@ -1130,6 +1126,7 @@ namespace OpenSim.Region.Framework.Scenes
                }
            }
        }
        // helper provided for parts.
        public int GetSceneMaxUndo()
        {
@@ -1183,7 +1180,6 @@ namespace OpenSim.Region.Framework.Scenes
            {
                SceneObjectPart part = GetChildPart(localId);
                OnGrabPart(part, offsetPos, remoteClient);
            }
        }
@@ -1267,28 +1263,10 @@ namespace OpenSim.Region.Framework.Scenes
                }
            }
-            if ((aggregateScriptEvents & scriptEvents.at_target) != 0)
+            m_scriptListens_atTarget = ((aggregateScriptEvents & scriptEvents.at_target) != 0);
-            {
+            m_scriptListens_notAtTarget = ((aggregateScriptEvents & scriptEvents.not_at_target) != 0);
-                m_scriptListens_atTarget = true;
-            }
-            else
-            {
-                m_scriptListens_atTarget = false;
-            }
-            if ((aggregateScriptEvents & scriptEvents.not_at_target) != 0)
-            {
-                m_scriptListens_notAtTarget = true;
-            }
-            else
-            {
-                m_scriptListens_notAtTarget = false;
-            }
-            if (m_scriptListens_atTarget || m_scriptListens_notAtTarget)
+            if (!m_scriptListens_atTarget && !m_scriptListens_notAtTarget)
-            {
-            }
-            else
            {
                lock (m_targets)
                    m_targets.Clear();
@@ -1787,9 +1765,6 @@ namespace OpenSim.Region.Framework.Scenes
            }            
        }
        /// <summary>
        /// Set the owner of the root part.
        /// </summary>
diff --git a/OpenSim/Region/Framework/Scenes/SceneObjectPart.cs b/OpenSim/Region/Framework/Scenes/SceneObjectPart.cs
index 3646811..5a74bad 100644
--- a/OpenSim/Region/Framework/Scenes/SceneObjectPart.cs
+++ b/OpenSim/Region/Framework/Scenes/SceneObjectPart.cs
@@ -2710,11 +2710,10 @@ if (m_shape != null) {
        public EntityIntersection TestIntersection(Ray iray, Quaternion parentrot)
        {
-            // In this case we're using a sphere with a radius of the largest dimention of the prim
+            // In this case we're using a sphere with a radius of the largest dimension of the prim
            // TODO: Change to take shape into account
+            EntityIntersection result = new EntityIntersection();
-            EntityIntersection returnresult = new EntityIntersection();
            Vector3 vAbsolutePosition = AbsolutePosition;
            Vector3 vScale = Scale;
            Vector3 rOrigin = iray.Origin;
@@ -2738,8 +2737,7 @@ if (m_shape != null) {
            Vector3 tmVal6 = vAbsolutePosition*rOrigin;
+            // Set Radius to the largest dimension of the prim
-            // Set Radius to the largest dimention of the prim
            float radius = 0f;
            if (vScale.X > radius)
                radius = vScale.X;
@@ -2765,7 +2763,7 @@ if (m_shape != null) {
            if (rootsqr < 0.0f)
            {
                // No intersection
-                return returnresult;
+                return result;
            }
            float root = ((-itestPart2) - (float) Math.Sqrt((double) rootsqr))/(itestPart1*2.0f);
@@ -2778,7 +2776,7 @@ if (m_shape != null) {
                if (root < 0.0f)
                {
                    // nope, no intersection
-                    return returnresult;
+                    return result;
                }
            }
@@ -2788,12 +2786,12 @@ if (m_shape != null) {
                new Vector3(iray.Origin.X + (iray.Direction.X*root), iray.Origin.Y + (iray.Direction.Y*root),
                            iray.Origin.Z + (iray.Direction.Z*root));
-            returnresult.HitTF = true;
+            result.HitTF = true;
-            returnresult.ipoint = ipoint;
+            result.ipoint = ipoint;
            // Normal is calculated by the difference and then normalizing the result
            Vector3 normalpart = ipoint - vAbsolutePosition;
-            returnresult.normal = normalpart / normalpart.Length();
+            result.normal = normalpart / normalpart.Length();
            // It's funny how the Vector3 object has a Distance function, but the Axiom.Math object doesn't.
            // I can write a function to do it..    but I like the fact that this one is Static.
@@ -2802,9 +2800,9 @@ if (m_shape != null) {
            Vector3 distanceConvert2 = new Vector3(ipoint.X, ipoint.Y, ipoint.Z);
            float distance = (float) Util.GetDistanceTo(distanceConvert1, distanceConvert2);
-            returnresult.distance = distance;
+            result.distance = distance;
-            return returnresult;
+            return result;
        }
        public EntityIntersection TestIntersectionOBB(Ray iray, Quaternion parentrot, bool frontFacesOnly, bool faceCenters)
@@ -3008,9 +3006,9 @@ if (m_shape != null) {
                //distance[i] = (normals[i].X * AmBa.X + normals[i].Y * AmBa.Y + normals[i].Z * AmBa.Z) * -1;
            }
-            EntityIntersection returnresult = new EntityIntersection();
+            EntityIntersection result = new EntityIntersection();
-            returnresult.distance = 1024;
+            result.distance = 1024;
            float c = 0;
            float a = 0;
            float d = 0;
@@ -3030,7 +3028,7 @@ if (m_shape != null) {
                //{
                    //if (iray.Origin.Dot(normals[i]) > d)
                    //{
-                        //return returnresult;
+                        //return result;
                    //}
                   // else
                    //{
@@ -3044,7 +3042,7 @@ if (m_shape != null) {
                    //{
                        //if (a > fmin)
                        //{
-                            //return returnresult;
+                            //return result;
                        //}
                        //fmax = a;
                    //}
@@ -3056,7 +3054,7 @@ if (m_shape != null) {
                    //{
                        //if (a < 0 || a < fmax)
                        //{
-                            //return returnresult;
+                            //return result;
                        //}
                        //fmin = a;
                    //}
@@ -3112,17 +3110,17 @@ if (m_shape != null) {
                    //    distance2 = (float)GetDistanceTo(q, iray.Origin);
                    //}
-                    if (distance2 < returnresult.distance)
+                    if (distance2 < result.distance)
                    {
-                        returnresult.distance = distance2;
+                        result.distance = distance2;
-                        returnresult.HitTF = true;
+                        result.HitTF = true;
-                        returnresult.ipoint = q;
+                        result.ipoint = q;
                        //m_log.Info("[FACE]:" + i.ToString());
                        //m_log.Info("[POINT]: " + q.ToString());
                        //m_log.Info("[DIST]: " + distance2.ToString());
                        if (faceCenters)
                        {
-                            returnresult.normal = AAfacenormals[i] * AXrot;
+                            result.normal = AAfacenormals[i] * AXrot;
                            Vector3 scaleComponent = AAfacenormals[i];
                            float ScaleOffset = 0.5f;
@@ -3130,20 +3128,20 @@ if (m_shape != null) {
                            if (scaleComponent.Y != 0) ScaleOffset = AXscale.Y;
                            if (scaleComponent.Z != 0) ScaleOffset = AXscale.Z;
                            ScaleOffset = Math.Abs(ScaleOffset);
-                            Vector3 offset = returnresult.normal * ScaleOffset;
+                            Vector3 offset = result.normal * ScaleOffset;
-                            returnresult.ipoint = AXpos + offset;
+                            result.ipoint = AXpos + offset;
                            ///pos = (intersectionpoint + offset);
                        }
                        else
                        {
-                            returnresult.normal = normals[i];
+                            result.normal = normals[i];
                        }
-                        returnresult.AAfaceNormal = AAfacenormals[i];
+                        result.AAfaceNormal = AAfacenormals[i];
                    }
                }
            }
-            return returnresult;
+            return result;
        }
        /// <summary>
diff --git a/OpenSim/Region/OptionalModules/Agent/InternetRelayClientView/Server/IRCClientView.cs b/OpenSim/Region/OptionalModules/Agent/InternetRelayClientView/Server/IRCClientView.cs
index 08fc61f..4a2d7b5 100644
--- a/OpenSim/Region/OptionalModules/Agent/InternetRelayClientView/Server/IRCClientView.cs
+++ b/OpenSim/Region/OptionalModules/Agent/InternetRelayClientView/Server/IRCClientView.cs
@@ -634,7 +634,7 @@ namespace OpenSim.Region.OptionalModules.Agent.InternetRelayClientView.Server
        {
            get { return (uint)Util.RandomClass.Next(0,int.MaxValue); }
        }
+#pragma warning disable 67
        public event GenericMessage OnGenericMessage;
        public event ImprovedInstantMessage OnInstantMessage;
        public event ChatMessage OnChatFromClient;
@@ -686,6 +686,7 @@ namespace OpenSim.Region.OptionalModules.Agent.InternetRelayClientView.Server
        public event SpinStop OnSpinStop;
        public event UpdateShape OnUpdatePrimShape;
        public event ObjectExtraParams OnUpdateExtraParams;
+        public event ObjectRequest OnObjectRequest;
        public event ObjectSelect OnObjectSelect;
        public event ObjectDeselect OnObjectDeselect;
        public event GenericCall7 OnObjectDescription;
@@ -825,6 +826,7 @@ namespace OpenSim.Region.OptionalModules.Agent.InternetRelayClientView.Server
        public event AvatarNotesUpdate OnAvatarNotesUpdate;
        public event MuteListRequest OnMuteListRequest;
        public event PlacesQuery OnPlacesQuery;
+#pragma warning restore 67
        public void SetDebugPacketLevel(int newDebug)
        {
diff --git a/OpenSim/Region/OptionalModules/Scripting/Minimodule/ISecurityCredential.cs b/OpenSim/Region/OptionalModules/Scripting/Minimodule/ISecurityCredential.cs
new file mode 100644
index 0000000..533d176
--- /dev/null
+++ b/OpenSim/Region/OptionalModules/Scripting/Minimodule/ISecurityCredential.cs
@@ -0,0 +1,36 @@
+/*
+ * 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.
+ */
+namespace OpenSim.Region.OptionalModules.Scripting.Minimodule
+{
+    public interface ISecurityCredential
+    {
+        ISocialEntity owner { get; }
+        bool CanEditObject(IObject target);
+        bool CanEditTerrain(int x, int y);
+    }
+}
+\ No newline at end of file
diff --git a/OpenSim/Region/OptionalModules/Scripting/Minimodule/Interfaces/IAvatar.cs b/OpenSim/Region/OptionalModules/Scripting/Minimodule/Interfaces/IAvatar.cs
index 849e3ca..03c1e95 100644
--- a/OpenSim/Region/OptionalModules/Scripting/Minimodule/Interfaces/IAvatar.cs
+++ b/OpenSim/Region/OptionalModules/Scripting/Minimodule/Interfaces/IAvatar.cs
@@ -32,19 +32,6 @@ using OpenMetaverse;
 namespace OpenSim.Region.OptionalModules.Scripting.Minimodule
 {
-    public interface IAvatarAttachment
-    {
-        //// <value>
-        /// Describes where on the avatar the attachment is located
-        /// </value>
-        int Location { get ; }
-        
-        //// <value>
-        /// Accessor to the rez'ed asset, representing the attachment
-        /// </value>
-        IObject Asset { get; }
-    }
    public interface IAvatar : IEntity
    {
        //// <value>
diff --git a/OpenSim/Region/OptionalModules/Scripting/Minimodule/Interfaces/IAvatarAttachment.cs b/OpenSim/Region/OptionalModules/Scripting/Minimodule/Interfaces/IAvatarAttachment.cs
new file mode 100644
index 0000000..22b4605
--- /dev/null
+++ b/OpenSim/Region/OptionalModules/Scripting/Minimodule/Interfaces/IAvatarAttachment.cs
@@ -0,0 +1,15 @@
+namespace OpenSim.Region.OptionalModules.Scripting.Minimodule
+{
+    public interface IAvatarAttachment
+    {
+        //// <value>
+        /// Describes where on the avatar the attachment is located
+        /// </value>
+        int Location { get ; }
+        
+        //// <value>
+        /// Accessor to the rez'ed asset, representing the attachment
+        /// </value>
+        IObject Asset { get; }
+    }
+}
+\ No newline at end of file
diff --git a/OpenSim/Region/OptionalModules/Scripting/Minimodule/Interfaces/IObject.cs b/OpenSim/Region/OptionalModules/Scripting/Minimodule/Interfaces/IObject.cs
index 6415250..19f7210 100644
--- a/OpenSim/Region/OptionalModules/Scripting/Minimodule/Interfaces/IObject.cs
+++ b/OpenSim/Region/OptionalModules/Scripting/Minimodule/Interfaces/IObject.cs
@@ -212,6 +212,6 @@ namespace OpenSim.Region.OptionalModules.Scripting.Minimodule
        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?]
+        bool BumpMap { get; set; } // SetPrimParms(BUMPMAP) [DEPRECATE IN FAVOUR OF UUID?]
    }
 }
diff --git a/OpenSim/Region/OptionalModules/Scripting/Minimodule/MRMModule.cs b/OpenSim/Region/OptionalModules/Scripting/Minimodule/MRMModule.cs
index 5ed9af3..6daae29 100644
--- a/OpenSim/Region/OptionalModules/Scripting/Minimodule/MRMModule.cs
+++ b/OpenSim/Region/OptionalModules/Scripting/Minimodule/MRMModule.cs
@@ -166,8 +166,14 @@ namespace OpenSim.Region.OptionalModules.Scripting.Minimodule
        public void GetGlobalEnvironment(uint localID, out IWorld world, out IHost host)
        {
-            world = new World(m_scene);
+            // UUID should be changed to object owner.
-            host = new Host(new SOPObject(m_scene, localID), m_scene, new ExtensionHandler(m_extensions), m_microthreads);
+            UUID owner = m_scene.RegionInfo.MasterAvatarAssignedUUID;
+            SEUser securityUser = new SEUser(owner, "Name Unassigned");
+            SecurityCredential creds = new SecurityCredential(securityUser, m_scene);
+            world = new World(m_scene, creds);
+            host = new Host(new SOPObject(m_scene, localID, creds), m_scene, new ExtensionHandler(m_extensions),
+                            m_microthreads);
        }
        public void InitializeMRM(MRMBase mmb, uint localID, UUID itemID)
diff --git a/OpenSim/Region/OptionalModules/Scripting/Minimodule/ObjectAccessor.cs b/OpenSim/Region/OptionalModules/Scripting/Minimodule/ObjectAccessor.cs
index 4638ad0..6ba5ccf 100644
--- a/OpenSim/Region/OptionalModules/Scripting/Minimodule/ObjectAccessor.cs
+++ b/OpenSim/Region/OptionalModules/Scripting/Minimodule/ObjectAccessor.cs
@@ -40,10 +40,12 @@ namespace OpenSim.Region.OptionalModules.Scripting.Minimodule
    {
        private readonly Scene m_scene;
        private readonly IEnumerator<EntityBase> m_sogEnum;
+        private readonly ISecurityCredential m_security;
-        public IObjEnum(Scene scene)
+        public IObjEnum(Scene scene, ISecurityCredential security)
        {
            m_scene = scene;
+            m_security = security;
            m_sogEnum = m_scene.Entities.GetAllByType<SceneObjectGroup>().GetEnumerator();
        }
@@ -66,7 +68,7 @@ namespace OpenSim.Region.OptionalModules.Scripting.Minimodule
        {
            get
            {
-                return new SOPObject(m_scene, m_sogEnum.Current.LocalId);
+                return new SOPObject(m_scene, m_sogEnum.Current.LocalId, m_security);
            }
        }
@@ -79,17 +81,19 @@ namespace OpenSim.Region.OptionalModules.Scripting.Minimodule
    public class ObjectAccessor : System.MarshalByRefObject, IObjectAccessor
    {
        private readonly Scene m_scene;
+        private readonly ISecurityCredential m_security;
-        public ObjectAccessor(Scene scene)
+        public ObjectAccessor(Scene scene, ISecurityCredential security)
        {
            m_scene = scene;
+            m_security = security;
        }
        public IObject this[int index]
        {
            get
            {
-                return new SOPObject(m_scene, m_scene.Entities[(uint)index].LocalId);
+                return new SOPObject(m_scene, m_scene.Entities[(uint)index].LocalId, m_security);
            }
        }
@@ -97,7 +101,7 @@ namespace OpenSim.Region.OptionalModules.Scripting.Minimodule
        {
            get
            {
-                return new SOPObject(m_scene, m_scene.Entities[index].LocalId);
+                return new SOPObject(m_scene, m_scene.Entities[index].LocalId, m_security);
            }
        }
@@ -105,7 +109,7 @@ namespace OpenSim.Region.OptionalModules.Scripting.Minimodule
        {
            get
            {
-                return new SOPObject(m_scene, m_scene.Entities[index].LocalId);
+                return new SOPObject(m_scene, m_scene.Entities[index].LocalId, m_security);
            }
        }
@@ -117,20 +121,20 @@ namespace OpenSim.Region.OptionalModules.Scripting.Minimodule
        public IObject Create(Vector3 position, Quaternion rotation)
        {
-            SceneObjectGroup sog = m_scene.AddNewPrim(m_scene.RegionInfo.MasterAvatarAssignedUUID,
+            SceneObjectGroup sog = m_scene.AddNewPrim(m_security.owner.GlobalID,
                                                      UUID.Zero,
                                                      position,
                                                      rotation,
                                                      PrimitiveBaseShape.CreateBox());
-            IObject ret = new SOPObject(m_scene, sog.LocalId);
+            IObject ret = new SOPObject(m_scene, sog.LocalId, m_security);
            return ret;
        }
        public IEnumerator<IObject> GetEnumerator()
        {
-            return new IObjEnum(m_scene);
+            return new IObjEnum(m_scene, m_security);
        }
        IEnumerator IEnumerable.GetEnumerator()
diff --git a/OpenSim/Region/OptionalModules/Scripting/Minimodule/SOPObject.cs b/OpenSim/Region/OptionalModules/Scripting/Minimodule/SOPObject.cs
index bc26389..35b0a0f 100644
--- a/OpenSim/Region/OptionalModules/Scripting/Minimodule/SOPObject.cs
+++ b/OpenSim/Region/OptionalModules/Scripting/Minimodule/SOPObject.cs
@@ -27,6 +27,7 @@
 using System;
 using System.Collections.Generic;
+using System.Security;
 using OpenMetaverse;
 using OpenMetaverse.Packets;
 using OpenSim.Framework;
@@ -42,13 +43,22 @@ namespace OpenSim.Region.OptionalModules.Scripting.Minimodule
    {
        private readonly Scene m_rootScene;
        private readonly uint m_localID;
+        private readonly ISecurityCredential m_security;
+        [Obsolete("Replace with 'credential' constructor [security]")]
        public SOPObject(Scene rootScene, uint localID)
        {
            m_rootScene = rootScene;
            m_localID = localID;
        }
+        public SOPObject(Scene rootScene, uint localID, ISecurityCredential credential)
+        {
+            m_rootScene = rootScene;
+            m_localID = localID;
+            m_security = credential;
+        }
        /// <summary>
        /// This needs to run very, very quickly.
        /// It is utilized in nearly every property and method.
@@ -59,6 +69,15 @@ namespace OpenSim.Region.OptionalModules.Scripting.Minimodule
            return m_rootScene.GetSceneObjectPart(m_localID);
        }
+        private bool CanEdit()
+        {
+            if(!m_security.CanEditObject(this))
+            {
+                throw new SecurityException("Insufficient Permission to edit object with UUID [" + GetSOP().UUID + "]");
+            }
+            return true;
+        }
        #region OnTouch
        private event OnTouchDelegate _OnTouch;
@@ -68,14 +87,17 @@ namespace OpenSim.Region.OptionalModules.Scripting.Minimodule
        {
            add
            {
-                if (!_OnTouchActive)
+                if (CanEdit())
                {
-                    GetSOP().Flags |= PrimFlags.Touch;
+                    if (!_OnTouchActive)
-                    _OnTouchActive = true;
+                    {
-                    m_rootScene.EventManager.OnObjectGrab += EventManager_OnObjectGrab;
+                        GetSOP().Flags |= PrimFlags.Touch;
+                        _OnTouchActive = true;
+                        m_rootScene.EventManager.OnObjectGrab += EventManager_OnObjectGrab;
+                    }
+                    _OnTouch += value;
                }
-                _OnTouch += value;
            }
            remove
            {
@@ -95,7 +117,7 @@ namespace OpenSim.Region.OptionalModules.Scripting.Minimodule
            if (_OnTouchActive && m_localID == localID)
            {
                TouchEventArgs e = new TouchEventArgs();
-                e.Avatar = new SPAvatar(m_rootScene, remoteClient.AgentId);
+                e.Avatar = new SPAvatar(m_rootScene, remoteClient.AgentId, m_security);
                e.TouchBiNormal = surfaceArgs.Binormal;
                e.TouchMaterialIndex = surfaceArgs.FaceIndex;
                e.TouchNormal = surfaceArgs.Normal;
@@ -130,13 +152,21 @@ namespace OpenSim.Region.OptionalModules.Scripting.Minimodule
        public string Name
        {
            get { return GetSOP().Name; }
-            set { GetSOP().Name = value; }
+            set
+            {
+                if (CanEdit())
+                    GetSOP().Name = value;
+            }
        }
        public string Description
        {
            get { return GetSOP().Description; }
-            set { GetSOP().Description = value; }
+            set
+            {
+                if (CanEdit()) 
+                    GetSOP().Description = value;
+            }
        }
        public IObject[] Children
@@ -151,7 +181,7 @@ namespace OpenSim.Region.OptionalModules.Scripting.Minimodule
                int i = 0;
                foreach (KeyValuePair<UUID, SceneObjectPart> pair in my.ParentGroup.Children)
                {
-                    rets[i++] = new SOPObject(m_rootScene, pair.Value.LocalId);
+                    rets[i++] = new SOPObject(m_rootScene, pair.Value.LocalId, m_security);
                }
                return rets;
@@ -160,7 +190,7 @@ namespace OpenSim.Region.OptionalModules.Scripting.Minimodule
        public IObject Root
        {
-            get { return new SOPObject(m_rootScene, GetSOP().ParentGroup.RootPart.LocalId); }
+            get { return new SOPObject(m_rootScene, GetSOP().ParentGroup.RootPart.LocalId, m_security); }
        }
        public IObjectMaterial[] Materials
@@ -182,7 +212,11 @@ namespace OpenSim.Region.OptionalModules.Scripting.Minimodule
        public Vector3 Scale
        {
            get { return GetSOP().Scale; }
-            set { GetSOP().Scale = value; }
+            set
+            {
+                if (CanEdit())
+                    GetSOP().Scale = value;
+            }
        }
        public Quaternion WorldRotation
@@ -202,15 +236,24 @@ namespace OpenSim.Region.OptionalModules.Scripting.Minimodule
            get { return GetSOP().AbsolutePosition; }
            set
            {
-                SceneObjectPart pos = GetSOP();
+                if (CanEdit())
-                pos.UpdateOffSet(value - pos.AbsolutePosition);
+                {
+                    SceneObjectPart pos = GetSOP();
+                    pos.UpdateOffSet(value - pos.AbsolutePosition);
+                }
            }
        }
        public Vector3 OffsetPosition
        {
            get { return GetSOP().OffsetPosition; }
-            set { GetSOP().OffsetPosition = value; }
+            set
+            {
+                if (CanEdit())
+                {
+                    GetSOP().OffsetPosition = value;
+                }
+            }
        }
        public Vector3 SitTarget
@@ -310,8 +353,10 @@ namespace OpenSim.Region.OptionalModules.Scripting.Minimodule
        public void Say(string msg)
        {
-            SceneObjectPart sop = GetSOP();
+            if (!CanEdit())
+                return;
+            SceneObjectPart sop = GetSOP();
            m_rootScene.SimChat(msg, ChatTypeEnum.Say, sop.AbsolutePosition, sop.Name, sop.UUID, false);
        }
@@ -503,6 +548,9 @@ namespace OpenSim.Region.OptionalModules.Scripting.Minimodule
            }
            set
            {
+                if (!CanEdit())
+                    return;
                GetSOP().PhysActor.RotationalVelocity = new PhysicsVector(value.X, value.Y, value.Z);
            }
        }
@@ -516,6 +564,9 @@ namespace OpenSim.Region.OptionalModules.Scripting.Minimodule
            }
            set
            {
+                if (!CanEdit())
+                    return;
                GetSOP().PhysActor.Velocity = new PhysicsVector(value.X, value.Y, value.Z);
            }
        }
@@ -529,6 +580,9 @@ namespace OpenSim.Region.OptionalModules.Scripting.Minimodule
            }
            set
            {
+                if (!CanEdit())
+                    return;
                GetSOP().PhysActor.Torque = new PhysicsVector(value.X, value.Y, value.Z);
            }
        }
@@ -551,27 +605,44 @@ namespace OpenSim.Region.OptionalModules.Scripting.Minimodule
            }
            set
            {
+                if (!CanEdit())
+                    return;
                GetSOP().PhysActor.Force = new PhysicsVector(value.X, value.Y, value.Z);
            }
        }
        public bool FloatOnWater
        {
-            set { GetSOP().PhysActor.FloatOnWater = value; }
+            set
+            {
+                if (!CanEdit())
+                    return;
+                GetSOP().PhysActor.FloatOnWater = value;
+            }
        }
        public void AddForce(Vector3 force, bool pushforce)
        {
+            if (!CanEdit())
+                return;
            GetSOP().PhysActor.AddForce(new PhysicsVector(force.X, force.Y, force.Z), pushforce);
        }
        public void AddAngularForce(Vector3 force, bool pushforce)
        {
+            if (!CanEdit())
+                return;
            GetSOP().PhysActor.AddAngularForce(new PhysicsVector(force.X, force.Y, force.Z), pushforce);
        }
        public void SetMomentum(Vector3 momentum)
        {
+            if (!CanEdit())
+                return;
            GetSOP().PhysActor.SetMomentum(new PhysicsVector(momentum.X, momentum.Y, momentum.Z));
        }
@@ -586,6 +657,9 @@ namespace OpenSim.Region.OptionalModules.Scripting.Minimodule
            get { return m_sculptMap; }
            set
            {
+                if (!CanEdit())
+                    return;
                m_sculptMap = value;
                SetPrimitiveSculpted(SculptMap, (byte) SculptType);
            }
@@ -598,6 +672,9 @@ namespace OpenSim.Region.OptionalModules.Scripting.Minimodule
            get { return m_sculptType; }
            set
            {
+                if(!CanEdit())
+                    return;
                m_sculptType = value;
                SetPrimitiveSculpted(SculptMap, (byte) SculptType);
            }
@@ -654,6 +731,9 @@ namespace OpenSim.Region.OptionalModules.Scripting.Minimodule
        public void Play(UUID asset, double volume)
        {
+            if (!CanEdit())
+                return;
            GetSOP().SendSound(asset.ToString(), volume, true, 0);
        }
diff --git a/OpenSim/Region/OptionalModules/Scripting/Minimodule/SPAvatar.cs b/OpenSim/Region/OptionalModules/Scripting/Minimodule/SPAvatar.cs
index ce2d339..4600836 100644
--- a/OpenSim/Region/OptionalModules/Scripting/Minimodule/SPAvatar.cs
+++ b/OpenSim/Region/OptionalModules/Scripting/Minimodule/SPAvatar.cs
@@ -42,11 +42,13 @@ namespace OpenSim.Region.OptionalModules.Scripting.Minimodule
    {
        private readonly Scene m_rootScene;
        private readonly UUID m_ID;
+        private readonly ISecurityCredential m_security;
        //private static readonly ILog m_log = LogManager.GetLogger(MethodBase.GetCurrentMethod().DeclaringType);
-        public SPAvatar(Scene scene, UUID ID)
+        public SPAvatar(Scene scene, UUID ID, ISecurityCredential security)
        {
            m_rootScene = scene;
+            m_security = security;
            m_ID = ID;
        }
@@ -84,7 +86,9 @@ namespace OpenSim.Region.OptionalModules.Scripting.Minimodule
                    foreach (DictionaryEntry element in internalAttachments)
                    {
                        Hashtable attachInfo = (Hashtable)element.Value;
-                        attachments.Add(new SPAvatarAttachment(m_rootScene, this, (int)element.Key, new UUID((string)attachInfo["item"]), new UUID((string)attachInfo["asset"])));
+                        attachments.Add(new SPAvatarAttachment(m_rootScene, this, (int) element.Key,
+                                                               new UUID((string) attachInfo["item"]),
+                                                               new UUID((string) attachInfo["asset"]), m_security));
                    }
                }
                
diff --git a/OpenSim/Region/OptionalModules/Scripting/Minimodule/SPAvatarAttachment.cs b/OpenSim/Region/OptionalModules/Scripting/Minimodule/SPAvatarAttachment.cs
index 9b684fe..570459a 100644
--- a/OpenSim/Region/OptionalModules/Scripting/Minimodule/SPAvatarAttachment.cs
+++ b/OpenSim/Region/OptionalModules/Scripting/Minimodule/SPAvatarAttachment.cs
@@ -39,10 +39,13 @@ namespace OpenSim.Region.OptionalModules.Scripting.Minimodule
        private readonly int m_location;
        //private readonly UUID m_itemId;
        private readonly UUID m_assetId;
+        private readonly ISecurityCredential m_security;
        
-        public SPAvatarAttachment(Scene rootScene, IAvatar self, int location, UUID itemId, UUID assetId)
+        public SPAvatarAttachment(Scene rootScene, IAvatar self, int location, UUID itemId, UUID assetId, ISecurityCredential security)
        {
            m_rootScene = rootScene;
+            m_security = security;
            //m_parent = self;
            m_location = location;
            //m_itemId = itemId;
@@ -55,7 +58,7 @@ namespace OpenSim.Region.OptionalModules.Scripting.Minimodule
        {
            get
            {
-                return new SOPObject(m_rootScene, m_rootScene.GetSceneObjectPart(m_assetId).LocalId);
+                return new SOPObject(m_rootScene, m_rootScene.GetSceneObjectPart(m_assetId).LocalId, m_security);
            }
        }
    }
diff --git a/OpenSim/Region/OptionalModules/Scripting/Minimodule/SecurityCredential.cs b/OpenSim/Region/OptionalModules/Scripting/Minimodule/SecurityCredential.cs
new file mode 100644
index 0000000..bc7f6cb
--- /dev/null
+++ b/OpenSim/Region/OptionalModules/Scripting/Minimodule/SecurityCredential.cs
@@ -0,0 +1,62 @@
+/*
+ * 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;
+using OpenSim.Region.Framework.Scenes;
+namespace OpenSim.Region.OptionalModules.Scripting.Minimodule
+{
+    class SecurityCredential : ISecurityCredential
+    {
+        private readonly ISocialEntity m_owner;
+        private readonly Scene m_scene;
+        public SecurityCredential(ISocialEntity m_owner, Scene m_scene)
+        {
+            this.m_owner = m_owner;
+            this.m_scene = m_scene;
+        }
+        public ISocialEntity owner
+        {
+            get { return m_owner; }
+        }
+        public bool CanEditObject(IObject target)
+        {
+            return m_scene.Permissions.CanEditObject(target.GlobalID, m_owner.GlobalID);
+        }
+        public bool CanEditTerrain(int x, int y)
+        {
+            return m_scene.Permissions.CanTerraformLand(m_owner.GlobalID, new Vector3(x, y, 0));
+        }
+    }
+}
diff --git a/OpenSim/Region/OptionalModules/Scripting/Minimodule/World.cs b/OpenSim/Region/OptionalModules/Scripting/Minimodule/World.cs
index 1ec4a33..da5ea0d 100644
--- a/OpenSim/Region/OptionalModules/Scripting/Minimodule/World.cs
+++ b/OpenSim/Region/OptionalModules/Scripting/Minimodule/World.cs
@@ -37,15 +37,17 @@ namespace OpenSim.Region.OptionalModules.Scripting.Minimodule
    public class World : System.MarshalByRefObject, IWorld, IWorldAudio 
    {
        private readonly Scene m_internalScene;
+        private readonly ISecurityCredential m_security;
        private readonly Heightmap m_heights;
        private readonly ObjectAccessor m_objs;
-        public World(Scene internalScene)
+        public World(Scene internalScene, ISecurityCredential securityCredential)
        {
+            m_security = securityCredential;
            m_internalScene = internalScene;
            m_heights = new Heightmap(m_internalScene);
-            m_objs = new ObjectAccessor(m_internalScene);
+            m_objs = new ObjectAccessor(m_internalScene, securityCredential);
        }
        #region Events
@@ -84,7 +86,7 @@ namespace OpenSim.Region.OptionalModules.Scripting.Minimodule
            if (_OnNewUser != null)
            {
                NewUserEventArgs e = new NewUserEventArgs();
-                e.Avatar = new SPAvatar(m_internalScene, presence.UUID);
+                e.Avatar = new SPAvatar(m_internalScene, presence.UUID, m_security);
                _OnNewUser(this, e);
            }
        }
@@ -144,7 +146,7 @@ namespace OpenSim.Region.OptionalModules.Scripting.Minimodule
            if (chat.Sender == null && chat.SenderObject != null)
            {
                ChatEventArgs e = new ChatEventArgs();
-                e.Sender = new SOPObject(m_internalScene, ((SceneObjectPart) chat.SenderObject).LocalId);
+                e.Sender = new SOPObject(m_internalScene, ((SceneObjectPart) chat.SenderObject).LocalId, m_security);
                e.Text = chat.Message;
                _OnChat(this, e);
@@ -154,7 +156,7 @@ namespace OpenSim.Region.OptionalModules.Scripting.Minimodule
            if (chat.Sender != null && chat.SenderObject == null)
            {
                ChatEventArgs e = new ChatEventArgs();
-                e.Sender = new SPAvatar(m_internalScene, chat.SenderUUID);
+                e.Sender = new SPAvatar(m_internalScene, chat.SenderUUID, m_security);
                e.Text = chat.Message;
                _OnChat(this, e);
@@ -207,7 +209,7 @@ namespace OpenSim.Region.OptionalModules.Scripting.Minimodule
                for (int i = 0; i < ents.Count; i++)
                {
                    EntityBase ent = ents[i];
-                    rets[i] = new SPAvatar(m_internalScene, ent.UUID);
+                    rets[i] = new SPAvatar(m_internalScene, ent.UUID, m_security);
                }
                return rets;
diff --git a/OpenSim/Region/OptionalModules/World/NPC/NPCAvatar.cs b/OpenSim/Region/OptionalModules/World/NPC/NPCAvatar.cs
index 4a8ba8c..f0bdf3b 100644
--- a/OpenSim/Region/OptionalModules/World/NPC/NPCAvatar.cs
+++ b/OpenSim/Region/OptionalModules/World/NPC/NPCAvatar.cs
@@ -213,6 +213,7 @@ namespace OpenSim.Region.OptionalModules.World.NPC
        public event UpdateShape OnUpdatePrimShape;
        public event ObjectExtraParams OnUpdateExtraParams;
        public event RequestObjectPropertiesFamily OnRequestObjectPropertiesFamily;
+        public event ObjectRequest OnObjectRequest;
        public event ObjectSelect OnObjectSelect;
        public event GenericCall7 OnObjectDescription;
        public event GenericCall7 OnObjectName;
diff --git a/OpenSim/Region/Physics/OdePlugin/OdePlugin.cs b/OpenSim/Region/Physics/OdePlugin/OdePlugin.cs
index 8fdc5a7..b7030f1 100644
--- a/OpenSim/Region/Physics/OdePlugin/OdePlugin.cs
+++ b/OpenSim/Region/Physics/OdePlugin/OdePlugin.cs
@@ -347,18 +347,13 @@ namespace OpenSim.Region.Physics.OdePlugin
                #endif
            }
-            // zero out a heightmap array float array (single dimention [flattened]))
+            // zero out a heightmap array float array (single dimension [flattened]))
            if ((int)Constants.RegionSize == 256)
                _heightmap = new float[514*514];
            else
                _heightmap = new float[(((int)Constants.RegionSize + 2) * ((int)Constants.RegionSize + 2))];
            _watermap = new float[258 * 258];
            // Zero out the prim spaces array (we split our space into smaller spaces so
            // we can hit test less.
        }
@@ -2197,7 +2192,7 @@ namespace OpenSim.Region.Physics.OdePlugin
        }
        /// <summary>
-        /// Called when a static prim moves.  Allocates a space for the prim based on it's position
+        /// Called when a static prim moves.  Allocates a space for the prim based on its position
        /// </summary>
        /// <param name="geom">the pointer to the geom that moved</param>
        /// <param name="pos">the position that the geom moved to</param>
@@ -3013,7 +3008,7 @@ namespace OpenSim.Region.Physics.OdePlugin
            float[] returnarr = new float[262144];
            float[,] resultarr = new float[m_regionWidth, m_regionHeight];
-            // Filling out the array into it's multi-dimentional components
+            // Filling out the array into its multi-dimensional components
            for (int y = 0; y < m_regionHeight; y++)
            {
                for (int x = 0; x < m_regionWidth; x++)
@@ -3126,7 +3121,7 @@ namespace OpenSim.Region.Physics.OdePlugin
            float[] returnarr = new float[262144];
            float[,] resultarr = new float[m_regionWidth,m_regionHeight];
-            // Filling out the array into it's multi-dimentional components
+            // Filling out the array into its multi-dimensional components
            for (int y = 0; y < m_regionHeight; y++)
            {
                for (int x = 0; x < m_regionWidth; x++)
diff --git a/OpenSim/Tests/Common/Mock/TestClient.cs b/OpenSim/Tests/Common/Mock/TestClient.cs
index bf4ddf0..fe31729 100644
--- a/OpenSim/Tests/Common/Mock/TestClient.cs
+++ b/OpenSim/Tests/Common/Mock/TestClient.cs
@@ -120,6 +120,7 @@ namespace OpenSim.Tests.Common.Mock
        public event ObjectExtraParams OnUpdateExtraParams;
        public event RequestObjectPropertiesFamily OnRequestObjectPropertiesFamily;
        public event ObjectSelect OnObjectSelect;
+        public event ObjectRequest OnObjectRequest;
        public event GenericCall7 OnObjectDescription;
        public event GenericCall7 OnObjectName;
        public event GenericCall7 OnObjectClickAction;
diff --git a/bin/OpenSim.ini.example b/bin/OpenSim.ini.example
index ff8fa5f..db993b4 100644
--- a/bin/OpenSim.ini.example
+++ b/bin/OpenSim.ini.example
@@ -4,7 +4,7 @@
    save_crashes = false
    ; Directory to save crashes to if above is enabled
-    ; (eg default is /opensimdir/crashes/*.txt or C:\opensim\crashes\*.txt)
+    ; (default is /opensimdir/crashes/*.txt or C:\opensim\crashes\*.txt)
    crash_dir = "crashes"
    ; Place to create a PID file
@@ -14,16 +14,16 @@
    ; Set HttpProxy to the URL for your proxy server if you would like
    ; to proxy llHTTPRequests through a firewall
    ; HttpProxy = "http://proxy.com"
-    ; Set HttpProxyExceptions to a list of regular expressions for 
+    ; Set HttpProxyExceptions to a list of regular expressions for
    ; URLs that you don't want going through the proxy such as servers
    ; inside your firewall, separate patterns with a ';'
    ; HttpProxyExceptions = ".mydomain.com;localhost"
-    ; Set this to true if you are connecting your OpenSimulator regions to a grid
+    ; Set this to true if you are connecting your regions to a grid
-    ; Set this to false if you are running OpenSimulator in standalone mode
+    ; Set this to false if you are running in standalone mode
    gridmode = false
-    
-    ; Set this to true if you want this OpenSimulator to run the Hypergrid functionality
+    ; Set this to true if you want Hypergrid functionality
    hypergrid = false
    startup_console_commands_file = "startup_commands.txt"
@@ -39,7 +39,7 @@
    ; Enables EventQueueGet Service.
    EventQueue = true
-    ; Set this to the DLL containig the client stack to use.
+    ; Set this to the DLL containing the client stack to use.
    clientstack_plugin="OpenSim.Region.ClientStack.LindenUDP.dll"
    ; ##
@@ -60,7 +60,7 @@
    ; except that everything is also enclosed in a <Regions> tag.
    ; regionload_webserver_url = "http://example.com/regions.xml";
-    ; Draw objects on maptile.   This step might take a long time if you've got a huge amount of
+    ; Draw objects on maptile.  This step might take a long time if you've got a large number of
    ; objects, so you can turn it off here if you'd like.
    DrawPrimOnMapTile = true
    ; Use terrain texture for maptiles if true, use shaded green if false
@@ -109,11 +109,11 @@
    ; If you're running a region server connecting to a grid, you probably want grid mode, since this will use the
    ; grid asset server.  If you select local in grid mode, then you will use a database as specified in asset_plugin to store assets
    ; locally.  This will mean you won't be able to take items using your assets to other people's regions.
-    
    ; Persistence of changed objects happens during regular sweeps. The following control that behaviour to
    ; prevent frequently changing objects from heavily loading the region data store.
    ; If both of these values are set to zero then persistence of all changed objects will happen on every sweep.
-    ; 
+    ;
    ; Objects will be considered for persistance in the next sweep when they have not changed for this number of seconds
    MinimumTimeBeforePersistenceConsidered = 60
    ; Objects will always be considered for persistance in the next sweep if the first change occurred this number of seconds ago
@@ -129,11 +129,11 @@
    ; if you would like to allow prims to be physical and move by physics with the physical checkbox in the client set this to true.
    physical_prim = true
-    ; Select a mesher here. ZeroMesher is save and fast.
+    ; Select a mesher here. ZeroMesher is safe and fast.
    ; ZeroMesher also means that the physics engine models the physics of prims
    ; sticking to the basic shapes the engine does support. Usually this is only a box.
    ; Meshmerizer gives a better handling of complex prims by using triangle meshes.
-    ; Note, that only ODE physics currently deals with meshed prims in a satisfactoring way
+    ; Note that only ODE physics currently deals with meshed prims in a satisfactory way
    ;
    meshing = ZeroMesher
    ;meshing = Meshmerizer
@@ -165,20 +165,20 @@
    ; Control user types that are allowed to create new scripts
    ; Only enforced if serviceside_object_permissions is true
-    ;   
+    ;
-    ; Current possible values are 
+    ; Current possible values are
    ;     all - anyone can create scripts (subject to normal permissions)
    ;     gods - only administrators can create scripts (as long as allow_grid_gods is true)
-    ; Default value is all 
+    ; Default value is all
    ; allowed_script_creators = all
    ; Control user types that are allowed to edit (save) scripts
    ; Only enforced if serviceside_object_permissions is true
-    ;   
+    ;
-    ; Current possible values are 
+    ; Current possible values are
    ;     all - anyone can edit scripts (subject to normal permissions)
    ;     gods - only administrators can edit scripts (as long as allow_grid_gods is true)
-    ; Default value is all 
+    ; Default value is all
    ; allowed_script_editors = all
    ; ##
@@ -220,9 +220,9 @@
    ; FLYSLOW, and the "always run" state will be the regular fly.
    enableflyslow = false
-   
    ; PreJump is an additional animation state, but it probably
-    ; won't look right until the physics engine supports it 
+    ; won't look right until the physics engine supports it
    ; (i.e delays takeoff for a moment)
    ; This is commented so it will come on automatically once it's
@@ -290,7 +290,7 @@
    ; Specifies the location and filename of the default inventory library control file.  The path can be relative or absolute
    ; Default is ./inventory/Libraries.xml
    LibrariesXMLFile="./inventory/Libraries.xml"
-    
 [Network]
    http_listener_port = 9000
    default_location_x = 1000
@@ -337,10 +337,10 @@
 [ClientStack.LindenUDP]
    ; This is the multiplier applied to all client throttles for outgoing UDP network data
-    ; If it is set to 1, then we obey the throttle settings as given to us by the client.  If it is set to 3, for example, then we 
+    ; If it is set to 1, then we obey the throttle settings as given to us by the client.  If it is set to 3, for example, then we
    ; multiply that setting by 3 (e.g. if the client gives us a setting of 250 kilobits per second then we
    ; will actually push down data at a maximum rate of 750 kilobits per second).
-    ; 
+    ;
    ; In principle, setting a multiplier greater than 1 will allow data to be pushed down to a client much faster
    ; than its UI allows the setting to go.  This may be okay in some situations, such as standalone OpenSim
    ; applications on a LAN.  However, the greater the multipler, the higher the risk of packet drop, resulting
@@ -350,11 +350,11 @@
    ; Currently this setting is 2 by default because we currently send much more texture data than is strictly
    ; necessary.  A setting of 1 could result in slow texture transfer.  This will be fixed when the transfer
    ; of textures at different levels of quality is improved.
-    ; 
+    ;
    ; Pre r7113, this setting was not exposed but was effectively 8.  You may want to try this if you encounter
    ; unexpected difficulties
    client_throttle_multiplier = 2;
-    
    ; the client socket receive buffer size determines how many
    ; incoming requests we can process; the default on .NET is 8192
    ; which is about 2 4k-sized UDP datagrams. On mono this is
@@ -429,9 +429,8 @@
    ; surface layer around geometries other geometries can sink into before generating a contact
    world_contact_surface_layer = 0.001
-    ; Filtering Collisions helps keep things stable physics wise, but sometimes 
+    ; Filtering collisions helps keep things stable physics wise, but sometimes
-    ; it can be over zealous.  If you notice bouncing, chances are it's being just
+    ; it can be overzealous.  If you notice bouncing, chances are it's that.
-    ; that
    filter_collisions = false
    ; Non Moving Terrain Contact (avatar isn't moving)
@@ -551,15 +550,15 @@
    ; ## Joint support
    ; ##
-    ; if you would like physics joints to be enabled through a special naming convention in the client, set this to true. 
+    ; if you would like physics joints to be enabled through a special naming convention in the client, set this to true.
    ; (see NINJA Physics documentation, http://opensimulator.org/wiki/NINJA_Physics)
    ; default is false
    ;use_NINJA_physics_joints = true
-    
    ; ##
    ; ## additional meshing options
    ; ##
-    
    ; physical collision mesh proxies are normally created for complex prim shapes, and collisions for simple boxes and
    ; spheres are computed algorithmically. If you would rather have mesh proxies for simple prims, you can set this to
    ; true. Note that this will increase memory usage and region startup time. Default is false.
@@ -602,10 +601,10 @@
    ;region_limit = 0
    ; enable only those methods you deem to be appropriate using a | delimited whitelist
-    ; for example, enabled_methods = admin_broadcast|admin_region_query|admin_save_oar|admin_save_xml    
+    ; for example, enabled_methods = admin_broadcast|admin_region_query|admin_save_oar|admin_save_xml
    ; if this parameter is not specified but enabled = true, all methods will be available
    enabled_methods = all
-   
 [RestPlugins]
    ; Change this to true to enable REST Plugins. This must be true if you wish to use
@@ -739,7 +738,7 @@
    ; Density of cloud cover 0.0 to 1.0 Defult 0.5
    density = 0.5
-    ; update interval for the cloud cover data returned by llCloud().  
+    ; update interval for the cloud cover data returned by llCloud().
    ; default is 1000
    cloud_update_rate = 1000
@@ -914,7 +913,7 @@
    ; This will be created in bin, if it doesn't exist already. It will hold the data snapshots.
    snapshot_cache_directory = "DataSnapshot"
-    ; This semicolon-separated string serves to notify specific data services about the existence 
+    ; This semicolon-separated string serves to notify specific data services about the existence
    ; of this sim. Uncomment if you want to index your data with this and/or other search providers.
    ;data_services="http://metaverseink.com/cgi-bin/register.py"
@@ -997,7 +996,7 @@
    DefaultCompileLanguage = lsl
    ; List of allowed languages (lsl,vb,js,cs)
-    ; AllowedCompilers=lsl,cs,js,vb.  
+    ; AllowedCompilers=lsl,cs,js,vb.
    ; *warning*, non lsl languages have access to static methods such as System.IO.File.  Enable at your own risk.
    AllowedCompilers=lsl
@@ -1050,13 +1049,13 @@
    ; Comma separated list of UUIDS allows the function for that list of UUIDS
    ; Allow_osSetRegionWaterHeight = 888760cb-a3cf-43ac-8ea4-8732fd3ee2bb
-    ; Allow for llCreateLink and llBreakLink to work without asking for permission 
+    ; Allow for llCreateLink and llBreakLink to work without asking for permission
    ; only enable this in a trusted environment otherwise you may be subject to hijacking
    ; AutomaticLinkPermission = false
    ; Disable underground movement of prims (default true); set to
    ; false to allow script controlled underground positioning of
-    ; prims 
+    ; prims
    ; DisableUndergroundMovement = true
@@ -1164,7 +1163,7 @@
 [MRM]
    ; Enables the Mini Region Modules Script Engine. WARNING: SECURITY RISK.
    ; default is false
-    Enabled = false 
+    Enabled = false
 [Hypergrid]
@@ -1176,7 +1175,7 @@
    ; The VivoxVoice module will allow you to provide voice on your
    ; region(s). It uses the same voice technology as the LL grid and
    ; works with recent LL clients (we have tested 1.22.9.110075, so
-    ; anything later ought to be fine as well). 
+    ; anything later ought to be fine as well).
    ;
    ; For this to work you need to obtain an admin account from Vivox
    ; that allows you to create voice accounts and region channels.
@@ -1234,14 +1233,14 @@
    ; In order for this to work you need a functioning freeswitch pbx set
    ; up.  Configuration for that will be posted in the wiki soon.
    enabled = false
-    ;FreeSwitch server is going to contact us and ask us all     
+    ;FreeSwitch server is going to contact us and ask us all
-    ;sorts of things.     
+    ;sorts of things.
-    freeswitch_server_user = freeswitch     
+    freeswitch_server_user = freeswitch
-    freeswitch_server_pass = password     
+    freeswitch_server_pass = password
-    freeswitch_api_prefix = /api     
+    freeswitch_api_prefix = /api
-    ; this is the IP of your sim     
+    ; this is the IP of your sim
    freeswitch_service_server = ip.address.of.your.sim
-    ;freeswitch_service_port = 80     
+    ;freeswitch_service_port = 80
    ; this should be the same port the region listens on
    freeswitch_service_port = 9000
    freeswitch_realm = ip.address.of.freeswitch.server
@@ -1251,15 +1250,15 @@
    freeswitch_echo_server = ip.address.of.freeswitch.server
    freeswitch_echo_port = 50505
    freeswitch_well_known_ip = ip.address.of.freeswitch.server
-    
    ;Type the address of your http server here, hostname is allowed.  This is provided so you can specify a hostname
    ;This is used by client for account verification.  By default, it's the same as the freeswitch service server.
-    
    ;opensim_well_known_http_address = Address_Of_your_SIM_HTTP_Server_Hostname_Allowed
    freeswitch_default_timeout = 5000
    freeswitch_subscribe_retry = 120
-    ; freeswitch_password_reset_url =  
+    ; freeswitch_password_reset_url =
 [Groups]
@@ -1268,19 +1267,19 @@
    ; This is the current groups stub in Region.CoreModules.Avatar.Groups
    Module  = Default
-    ; The PHP code for the server is available from the Flotsam project for you to deploy 
+    ; The PHP code for the server is available from the Flotsam project for you to deploy
    ; to your own server.  The Flotsam project is located at http://code.google.com/p/flotsam/
    ;
    ;Module  = GroupsModule
-    
    ; Enable Group Notices
-        ;NoticesEnabled   = true
+    ;NoticesEnabled   = true
    ; This makes the Groups modules very chatty on the console.
    ;DebugEnabled     = true
-    ; Specify which messaging module to use for groups messaging and if it's enabled    
+    ; Specify which messaging module to use for groups messaging and if it's enabled
-        ;MessagingModule = GroupsMessagingModule
+    ;MessagingModule = GroupsMessagingModule
    ;MessagingEnabled = true
    ; Service connector to Groups Service [Select One]
@@ -1290,9 +1289,9 @@
    ;XmlRpcServiceReadKey    = 1234
    ;XmlRpcServiceWriteKey   = 1234
-    ; Disables HTTP Keep-Alive for XmlRpcGroupsServicesConnector HTTP Requests, 
+    ; Disables HTTP Keep-Alive for XmlRpcGroupsServicesConnector HTTP Requests,
-        ; this is a work around fora problem discovered on some Windows based region servers.  
+    ; this is a work around fora problem discovered on some Windows based region servers.
-        ; Only disable keep alive if you see a large number (dozens) of the following Exceptions:
+    ; Only disable keep alive if you see a large number (dozens) of the following Exceptions:
    ; System.Net.WebException: The request was aborted: The request was canceled.
    ;
    ; XmlRpcDisableKeepAlive = false
@@ -1321,7 +1320,7 @@
    ;FullUpdateRate=14
    ;PacketMTU = 1400
-    
    ; TextureUpdateRate (mS) determines how many times per second
    ; texture send processing will occur. The default is 100mS.
    ;
@@ -1371,7 +1370,6 @@
    ; to customize your data
    ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
    ;; The below pulls in optional module config files
    ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;