66 files changed, 1645 insertions, 1355 deletions
diff --git a/OpenSim/Region/ClientStack/Linden/UDP/LLClientView.cs b/OpenSim/Region/ClientStack/Linden/UDP/LLClientView.cs
index f580e5a..fad250b 100644
--- a/OpenSim/Region/ClientStack/Linden/UDP/LLClientView.cs
+++ b/OpenSim/Region/ClientStack/Linden/UDP/LLClientView.cs
@@ -2801,6 +2801,48 @@ namespace OpenSim.Region.ClientStack.LindenUDP
            SendAgentGroupDataUpdate(AgentId,GroupMembership);
        }
+        public void SendSelectedPartsProprieties(List<ISceneEntity> parts)
+        {
+            // udp part           
+            ObjectPropertiesPacket packet = 
+                (ObjectPropertiesPacket)PacketPool.Instance.GetPacket(PacketType.ObjectProperties);
+            ObjectPropertiesPacket.ObjectDataBlock[] ObjectData = new ObjectPropertiesPacket.ObjectDataBlock[parts.Count];
+            int i = 0;
+            foreach(SceneObjectPart sop in parts)
+                ObjectData[i++] = CreateObjectPropertiesBlock(sop);
+   
+            packet.ObjectData = ObjectData;
+            packet.Header.Zerocoded = true;
+            // udp send splits this mega packets correctly
+            // mb later will avoid that to reduce gc stress
+            OutPacket(packet, ThrottleOutPacketType.Task, true);
+            // caps physics part
+            IEventQueue eq = Scene.RequestModuleInterface<IEventQueue>();
+            if(eq == null)
+                return;
+            OSDArray array = new OSDArray();
+            foreach(SceneObjectPart sop in parts)
+            {
+                OSDMap physinfo = new OSDMap(6);
+                physinfo["LocalID"] = sop.LocalId;
+                physinfo["Density"] = sop.Density;
+                physinfo["Friction"] = sop.Friction;
+                physinfo["GravityMultiplier"] = sop.GravityModifier;
+                physinfo["Restitution"] = sop.Restitution;
+                physinfo["PhysicsShapeType"] = (int)sop.PhysicsShapeType;
+                array.Add(physinfo);
+            }
+            OSDMap llsdBody = new OSDMap(1);
+            llsdBody.Add("ObjectData", array);
+            eq.Enqueue(BuildEvent("ObjectPhysicsProperties", llsdBody),AgentId);
+        }
        public void SendPartPhysicsProprieties(ISceneEntity entity)
        {
            SceneObjectPart part = (SceneObjectPart)entity;
@@ -2882,18 +2924,24 @@ namespace OpenSim.Region.ClientStack.LindenUDP
        public void SendAsset(AssetRequestToClient req)
        {
+            if (req.AssetInf == null)
+            {
+                m_log.ErrorFormat("{0} Cannot send asset {1} ({2}), asset is null",
+                                LogHeader);
+                return;
+            }
            if (req.AssetInf.Data == null)
            {
                m_log.ErrorFormat("{0} Cannot send asset {1} ({2}), asset data is null",
                                LogHeader, req.AssetInf.ID, req.AssetInf.Metadata.ContentType);
                return;
            }
            int WearableOut = 0;
            bool isWearable = false;
-            if (req.AssetInf != null)
+            isWearable = ((AssetType) req.AssetInf.Type ==
-                isWearable =
-                    ((AssetType) req.AssetInf.Type ==
                     AssetType.Bodypart || (AssetType) req.AssetInf.Type == AssetType.Clothing);
            
@@ -3013,7 +3061,7 @@ namespace OpenSim.Region.ClientStack.LindenUDP
            reply.Data.ParcelID = parcelID;
            reply.Data.OwnerID = land.OwnerID;
            reply.Data.Name = Utils.StringToBytes(land.Name);
-            if (land != null && land.Description != null && land.Description != String.Empty)
+            if (land.Description != null && land.Description != String.Empty)
                reply.Data.Desc = Utils.StringToBytes(land.Description.Substring(0, land.Description.Length > 254 ? 254: land.Description.Length));
            else
                reply.Data.Desc = new Byte[0];
@@ -4221,46 +4269,42 @@ namespace OpenSim.Region.ClientStack.LindenUDP
              
                if (!canUseImproved && !canUseCompressed)
                {
+                    ObjectUpdatePacket.ObjectDataBlock ablock;
                    if (update.Entity is ScenePresence)
-                    {
+                        ablock = CreateAvatarUpdateBlock((ScenePresence)update.Entity);
-                        ObjectUpdatePacket.ObjectDataBlock ablock =
-                                CreateAvatarUpdateBlock((ScenePresence)update.Entity);
-                        objectUpdateBlocks.Value.Add(ablock);
-                        maxUpdatesBytes -= ablock.Length;
-                    }
                    else
-                    {
+                        ablock = CreatePrimUpdateBlock((SceneObjectPart)update.Entity, this.m_agentId);
-                        ObjectUpdatePacket.ObjectDataBlock ablock =
+                    objectUpdateBlocks.Value.Add(ablock);
-                                CreatePrimUpdateBlock((SceneObjectPart)update.Entity, this.m_agentId);
+                    objectUpdates.Value.Add(update);
-                        objectUpdateBlocks.Value.Add(ablock);
+                    maxUpdatesBytes -= ablock.Length;
-                        maxUpdatesBytes -= ablock.Length;
-                    }
                }
                else if (!canUseImproved)
                {
                    ObjectUpdateCompressedPacket.ObjectDataBlock ablock =
                            CreateCompressedUpdateBlock((SceneObjectPart)update.Entity, updateFlags);
                    compressedUpdateBlocks.Value.Add(ablock);
+                    compressedUpdates.Value.Add(update);
                    maxUpdatesBytes -= ablock.Length;
                }
                else
                {
+                    ImprovedTerseObjectUpdatePacket.ObjectDataBlock ablock;
                    if (update.Entity is ScenePresence)
                    {
                        // ALL presence updates go into a special list
-                        ImprovedTerseObjectUpdatePacket.ObjectDataBlock ablock = 
+                        ablock = CreateImprovedTerseBlock(update.Entity, updateFlags.HasFlag(PrimUpdateFlags.Textures));
-                                CreateImprovedTerseBlock(update.Entity, updateFlags.HasFlag(PrimUpdateFlags.Textures));
                        terseAgentUpdateBlocks.Value.Add(ablock);
-                        maxUpdatesBytes -= ablock.Length;
+                        terseAgentUpdates.Value.Add(update);
                    }
                    else
                    {
                        // Everything else goes here
-                        ImprovedTerseObjectUpdatePacket.ObjectDataBlock ablock =
+                        ablock = CreateImprovedTerseBlock(update.Entity, updateFlags.HasFlag(PrimUpdateFlags.Textures));
-                                CreateImprovedTerseBlock(update.Entity, updateFlags.HasFlag(PrimUpdateFlags.Textures));
                        terseUpdateBlocks.Value.Add(ablock);
-                        maxUpdatesBytes -= ablock.Length;
+                        terseUpdates.Value.Add(update);
                    }
+                    maxUpdatesBytes -= ablock.Length;
                }
                #endregion Block Construction
@@ -4290,7 +4334,7 @@ namespace OpenSim.Region.ClientStack.LindenUDP
                for (int i = 0; i < blocks.Count; i++)
                    packet.ObjectData[i] = blocks[i];
-                OutPacket(packet, ThrottleOutPacketType.Unknown, true, delegate(OutgoingPacket oPacket) { ResendPrimUpdates(terseUpdates.Value, oPacket); });
+                OutPacket(packet, ThrottleOutPacketType.Unknown, true, delegate(OutgoingPacket oPacket) { ResendPrimUpdates(terseAgentUpdates.Value, oPacket); });
            }
            if (objectUpdateBlocks.IsValueCreated)
@@ -4305,7 +4349,7 @@ namespace OpenSim.Region.ClientStack.LindenUDP
                for (int i = 0; i < blocks.Count; i++)
                    packet.ObjectData[i] = blocks[i];
-                OutPacket(packet, ThrottleOutPacketType.Task, true);
+                OutPacket(packet, ThrottleOutPacketType.Task, true, delegate(OutgoingPacket oPacket) { ResendPrimUpdates(objectUpdates.Value, oPacket); });
            }
    
            if (compressedUpdateBlocks.IsValueCreated)
@@ -4320,7 +4364,7 @@ namespace OpenSim.Region.ClientStack.LindenUDP
                for (int i = 0; i < blocks.Count; i++)
                    packet.ObjectData[i] = blocks[i];
-                OutPacket(packet, ThrottleOutPacketType.Task, true);
+                OutPacket(packet, ThrottleOutPacketType.Task, true, delegate(OutgoingPacket oPacket) { ResendPrimUpdates(compressedUpdates.Value, oPacket); });
            }
    
            if (terseUpdateBlocks.IsValueCreated)
@@ -5444,22 +5488,21 @@ namespace OpenSim.Region.ClientStack.LindenUDP
            Quaternion rotation;
            byte[] textureEntry;
-            if (entity is ScenePresence)
+            if (avatar)
            {
                ScenePresence presence = (ScenePresence)entity;
                position = presence.OffsetPosition;
+                velocity = presence.Velocity;
+                acceleration = Vector3.Zero;
                rotation = presence.Rotation;
                angularVelocity = presence.AngularVelocity;
-                rotation = presence.Rotation;
 //                m_log.DebugFormat(
 //                    "[LLCLIENTVIEW]: Sending terse update to {0} with position {1} in {2}", Name, presence.OffsetPosition, m_scene.Name);
                attachPoint = presence.State;
                collisionPlane = presence.CollisionPlane;
-                velocity = presence.Velocity;
-                acceleration = Vector3.Zero;
                if (sendTexture)
                {
@@ -7710,20 +7753,19 @@ namespace OpenSim.Region.ClientStack.LindenUDP
                    return true;
            }
            #endregion
+            List<uint> thisSelection = new List<uint>();
            ObjectSelect handlerObjectSelect = null;
            uint objID;
-            for (int i = 0; i < incomingselect.ObjectData.Length; i++)
+            handlerObjectSelect = OnObjectSelect;
+            if (handlerObjectSelect != null)
            {
-                objID = incomingselect.ObjectData[i].ObjectLocalID;
+                for (int i = 0; i < incomingselect.ObjectData.Length; i++)
-                if (!SelectedObjects.Contains(objID))
-                    SelectedObjects.Add(objID);
-                handlerObjectSelect = OnObjectSelect;
-                if (handlerObjectSelect != null)
                {
-                    handlerObjectSelect(objID, this);
+                    objID = incomingselect.ObjectData[i].ObjectLocalID;
+                    thisSelection.Add(objID);
                }
+                handlerObjectSelect(thisSelection, this);
            }
            return true;
        }
@@ -7746,8 +7788,6 @@ namespace OpenSim.Region.ClientStack.LindenUDP
            for (int i = 0; i < incomingdeselect.ObjectData.Length; i++)
            {
                objID = incomingdeselect.ObjectData[i].ObjectLocalID;
-                if (SelectedObjects.Contains(objID))
-                    SelectedObjects.Remove(objID);
                handlerObjectDeselect = OnObjectDeselect;
                if (handlerObjectDeselect != null)
@@ -7969,6 +8009,7 @@ namespace OpenSim.Region.ClientStack.LindenUDP
                        touchArgs.Add(arg);
                    }
                }
                handlerGrabUpdate(grabUpdate.ObjectData.ObjectID, grabUpdate.ObjectData.GrabOffsetInitial,
                                  grabUpdate.ObjectData.GrabPosition, this, touchArgs);
            }
@@ -12409,72 +12450,6 @@ namespace OpenSim.Region.ClientStack.LindenUDP
        /// <param name="simclient"></param>
        /// <param name="packet"></param>
        /// <returns></returns>
-        // TODO: Convert old handler to use new method
-/*
-        protected bool HandleAgentTextureCached(IClientAPI simclient, Packet packet)
-        {
-            AgentCachedTexturePacket cachedtex = (AgentCachedTexturePacket)packet;
-            AgentCachedTextureResponsePacket cachedresp = (AgentCachedTextureResponsePacket)PacketPool.Instance.GetPacket(PacketType.AgentCachedTextureResponse);
-            if (cachedtex.AgentData.SessionID != SessionId)
-                return false;
-            
-            // TODO: don't create new blocks if recycling an old packet
-            cachedresp.AgentData.AgentID = AgentId;
-            cachedresp.AgentData.SessionID = m_sessionId;
-            cachedresp.AgentData.SerialNum = m_cachedTextureSerial;
-            m_cachedTextureSerial++;
-            cachedresp.WearableData =
-                new AgentCachedTextureResponsePacket.WearableDataBlock[cachedtex.WearableData.Length];
-            int maxWearablesLoop = cachedtex.WearableData.Length;
-            if (maxWearablesLoop > AvatarWearable.MAX_WEARABLES)
-                maxWearablesLoop = AvatarWearable.MAX_WEARABLES;
-            // Find the cached baked textures for this user, if they're available
-            IAssetService cache = m_scene.AssetService;
-            IBakedTextureModule bakedTextureModule = m_scene.RequestModuleInterface<IBakedTextureModule>();
-            
-            WearableCacheItem[] cacheItems = null;
-            if (bakedTextureModule != null && cache != null)
-            {
-                ScenePresence p = m_scene.GetScenePresence(AgentId);
-                if (p.Appearance != null)
-                {
-                    if (p.Appearance.WearableCacheItems == null || p.Appearance.WearableCacheItemsDirty)
-                    {
-                        try
-                        {
-                            cacheItems = bakedTextureModule.Get(AgentId);
-                            p.Appearance.WearableCacheItems = cacheItems;
-                            p.Appearance.WearableCacheItemsDirty = false;
-                        }
-                        catch (Exception)
-                        {
-                            cacheItems = null;
-                        }
-                    }
-                    else if (p.Appearance.WearableCacheItems != null)
-                    {
-                        cacheItems = p.Appearance.WearableCacheItems;
-                    }
-                }
-            }
-            CachedTextureRequest handlerCachedTextureRequest = OnCachedTextureRequest;
-            if (handlerCachedTextureRequest != null)
-            {
-                handlerCachedTextureRequest(simclient,cachedtex.AgentData.SerialNum,requestArgs);
-            }
-            return true;
-        }
-*/
        protected bool HandleAgentTextureCached(IClientAPI simclient, Packet packet)
        {
diff --git a/OpenSim/Region/CoreModules/Agent/Xfer/XferModule.cs b/OpenSim/Region/CoreModules/Agent/Xfer/XferModule.cs
index 41ce860..1391013 100644
--- a/OpenSim/Region/CoreModules/Agent/Xfer/XferModule.cs
+++ b/OpenSim/Region/CoreModules/Agent/Xfer/XferModule.cs
@@ -124,20 +124,26 @@ namespace OpenSim.Region.CoreModules.Agent.Xfer
                    double now = Util.GetTimeStampMS();
                    if(now - lastTimeTick > 1750.0)
                    {
-                        inTimeTick = true;
-                        //don't overload busy heartbeat
-                        WorkManager.RunInThread(
-                        delegate
-                        {
-                            transfersTimeTick(now);
-                            expireFiles(now);
+                        if(Transfers.Count == 0 && NewFiles.Count == 0)
                            lastTimeTick = now;
-                            inTimeTick = false;
+                        else
-                        },
+                        {
-                        null,
+                            inTimeTick = true;
-                        "XferTimeTick");
+                            //don't overload busy heartbeat
+                            WorkManager.RunInThreadPool(
+                                delegate
+                                {
+                                    transfersTimeTick(now);
+                                    expireFiles(now);
+                                    lastTimeTick = now;
+                                    inTimeTick = false;
+                                },
+                                null,
+                                "XferTimeTick");
+                        }
                    }
                }
                Monitor.Exit(timeTickLock);
diff --git a/OpenSim/Region/CoreModules/Avatar/Attachments/AttachmentsModule.cs b/OpenSim/Region/CoreModules/Avatar/Attachments/AttachmentsModule.cs
index 8f03a0a..d5c81ce 100644
--- a/OpenSim/Region/CoreModules/Avatar/Attachments/AttachmentsModule.cs
+++ b/OpenSim/Region/CoreModules/Avatar/Attachments/AttachmentsModule.cs
@@ -594,8 +594,12 @@ namespace OpenSim.Region.CoreModules.Avatar.Attachments
                    group.ResumeScripts();
                }
+                else
                // Do this last so that event listeners have access to all the effects of the attachment
-                m_scene.EventManager.TriggerOnAttach(group.LocalId, group.FromItemID, sp.UUID);
+                // this can't be done when creating scripts:
+                // scripts do internal enqueue of attach event
+                // and not all scripts are loaded at this point
+                    m_scene.EventManager.TriggerOnAttach(group.LocalId, group.FromItemID, sp.UUID);
            }
            return true;
@@ -1053,7 +1057,6 @@ namespace OpenSim.Region.CoreModules.Avatar.Attachments
            if (fireDetachEvent)
            {
                m_scene.EventManager.TriggerOnAttach(grp.LocalId, grp.FromItemID, UUID.Zero);
                // Allow detach event time to do some work before stopping the script
                Thread.Sleep(2);
            }
@@ -1115,13 +1118,15 @@ namespace OpenSim.Region.CoreModules.Avatar.Attachments
            SceneObjectGroup objatt;
+            UUID rezGroupID = sp.ControllingClient.ActiveGroupId;
            if (itemID != UUID.Zero)
                objatt = m_invAccessModule.RezObject(sp.ControllingClient,
-                    itemID, Vector3.Zero, Vector3.Zero, UUID.Zero, (byte)1, true,
+                    itemID, rezGroupID, Vector3.Zero, Vector3.Zero, UUID.Zero, (byte)1, true,
                    false, false, sp.UUID, true);
            else
-                objatt = m_invAccessModule.RezObject(sp.ControllingClient,
+                objatt = m_invAccessModule.RezObject(sp.ControllingClient, 
-                    null, assetID, Vector3.Zero, Vector3.Zero, UUID.Zero, (byte)1, true,
+                    null, rezGroupID, assetID, Vector3.Zero, Vector3.Zero, UUID.Zero, (byte)1, true,
                    false, false, sp.UUID, true);
            if (objatt == null)
@@ -1318,7 +1323,8 @@ namespace OpenSim.Region.CoreModules.Avatar.Attachments
                AttachmentPt &= 0x7f;
                // Calls attach with a Zero position
-                if (AttachObject(sp, part.ParentGroup, AttachmentPt, false, true, append))
+                SceneObjectGroup group = part.ParentGroup;
+                if (AttachObject(sp, group , AttachmentPt, false, true, append))
                {
                    if (DebugLevel > 0)
                        m_log.Debug(
@@ -1377,7 +1383,6 @@ namespace OpenSim.Region.CoreModules.Avatar.Attachments
            if (sp != null)
                DetachSingleAttachmentToGround(sp, soLocalId);
        }
        #endregion
    }
 }
diff --git a/OpenSim/Region/CoreModules/Avatar/Attachments/Tests/AttachmentsModuleTests.cs b/OpenSim/Region/CoreModules/Avatar/Attachments/Tests/AttachmentsModuleTests.cs
index a83342c..16f1952 100644
--- a/OpenSim/Region/CoreModules/Avatar/Attachments/Tests/AttachmentsModuleTests.cs
+++ b/OpenSim/Region/CoreModules/Avatar/Attachments/Tests/AttachmentsModuleTests.cs
@@ -55,6 +55,7 @@ using OpenSim.Tests.Common;
 namespace OpenSim.Region.CoreModules.Avatar.Attachments.Tests
 {
+/*
    /// <summary>
    /// Attachment tests
    /// </summary>
@@ -804,7 +805,7 @@ namespace OpenSim.Region.CoreModules.Avatar.Attachments.Tests
            Assert.That(m_numberOfAttachEventsFired, Is.EqualTo(0));
        }
-/*
        [Test]
        public void TestSameSimulatorNeighbouringRegionsTeleportV1()
        {
@@ -844,7 +845,7 @@ namespace OpenSim.Region.CoreModules.Avatar.Attachments.Tests
                sceneB, config, new CapabilitiesModule(), etmB, attModB, new BasicInventoryAccessModule());
            // FIXME: Hack - this is here temporarily to revert back to older entity transfer behaviour
-            lscm.ServiceVersion = 0.1f;
+            //lscm.ServiceVersion = 0.1f;
            UserAccount ua1 = UserAccountHelpers.CreateUserWithInventory(sceneA, 0x1);
@@ -912,7 +913,7 @@ namespace OpenSim.Region.CoreModules.Avatar.Attachments.Tests
            // Check events
            Assert.That(m_numberOfAttachEventsFired, Is.EqualTo(0));
        }
-*/
        [Test]
        public void TestSameSimulatorNeighbouringRegionsTeleportV2()
@@ -1025,4 +1026,5 @@ namespace OpenSim.Region.CoreModules.Avatar.Attachments.Tests
            Assert.That(m_numberOfAttachEventsFired, Is.EqualTo(0));
        }
    }
+*/
 }
diff --git a/OpenSim/Region/CoreModules/Avatar/Inventory/Transfer/InventoryTransferModule.cs b/OpenSim/Region/CoreModules/Avatar/Inventory/Transfer/InventoryTransferModule.cs
index 6c2cf0a..46da5a9 100644
--- a/OpenSim/Region/CoreModules/Avatar/Inventory/Transfer/InventoryTransferModule.cs
+++ b/OpenSim/Region/CoreModules/Avatar/Inventory/Transfer/InventoryTransferModule.cs
@@ -324,15 +324,6 @@ namespace OpenSim.Region.CoreModules.Avatar.Inventory.Transfer
                if (destinationFolderID != UUID.Zero)
                {
                    InventoryFolderBase destinationFolder = new InventoryFolderBase(destinationFolderID, client.AgentId);
-                    if (destinationFolder == null)
-                    {
-                        m_log.WarnFormat(
-                            "[INVENTORY TRANSFER]: TaskInventoryAccepted message from {0} in {1} specified folder {2} which does not exist",
-                            client.Name, scene.Name, destinationFolderID);
-                        return;
-                    }
                    IInventoryService invService = scene.InventoryService;
                    UUID inventoryID = new UUID(im.imSessionID); // The inventory item/folder, back from it's trip
diff --git a/OpenSim/Region/CoreModules/Avatar/UserProfiles/UserProfileModule.cs b/OpenSim/Region/CoreModules/Avatar/UserProfiles/UserProfileModule.cs
index 145f3db..61835f9 100644
--- a/OpenSim/Region/CoreModules/Avatar/UserProfiles/UserProfileModule.cs
+++ b/OpenSim/Region/CoreModules/Avatar/UserProfiles/UserProfileModule.cs
@@ -31,6 +31,7 @@ using System.Text;
 using System.Collections;
 using System.Collections.Generic;
 using System.Globalization;
+using System.Linq;
 using System.Net;
 using System.Net.Sockets;
 using System.Reflection;
@@ -458,36 +459,43 @@ namespace OpenSim.Region.CoreModules.Avatar.UserProfiles
                                         int queryclassifiedPrice, IClientAPI remoteClient)
        {
            Scene s = (Scene)remoteClient.Scene;
-            IMoneyModule money = s.RequestModuleInterface<IMoneyModule>();
-            if (money != null)
-            {
-                if (!money.AmountCovered(remoteClient.AgentId, queryclassifiedPrice))
-                {
-                    remoteClient.SendAgentAlertMessage("You do not have enough money to create requested classified.", false);
-                    return;
-                }
-                money.ApplyCharge(remoteClient.AgentId, queryclassifiedPrice, MoneyTransactionType.ClassifiedCharge);
-            }
-            UserClassifiedAdd ad = new UserClassifiedAdd();
            Vector3 pos = remoteClient.SceneAgent.AbsolutePosition;
            ILandObject land = s.LandChannel.GetLandObject(pos.X, pos.Y);
-            ScenePresence p = FindPresence(remoteClient.AgentId);
+            UUID creatorId = remoteClient.AgentId;
-            
+            ScenePresence p = FindPresence(creatorId);
            string serverURI = string.Empty;
            GetUserProfileServerURI(remoteClient.AgentId, out serverURI);
-            if (land == null)
+            OSDMap parameters = new OSDMap {{"creatorId", OSD.FromUUID(creatorId)}};
+            OSD Params = (OSD)parameters;
+            if (!rpc.JsonRpcRequest(ref Params, "avatarclassifiedsrequest", serverURI, UUID.Random().ToString()))
            {
-                ad.ParcelName = string.Empty;
+                remoteClient.SendAgentAlertMessage("Error fetching classifieds", false);
+                return;
            }
-            else
+            parameters = (OSDMap)Params;
+            OSDArray list = (OSDArray)parameters["result"];
+            bool exists = list.Cast<OSDMap>().Where(map => map.ContainsKey("classifieduuid"))
+              .Any(map => map["classifieduuid"].AsUUID().Equals(queryclassifiedID));
+            if (!exists)
            {
-                ad.ParcelName = land.LandData.Name;
+                IMoneyModule money = s.RequestModuleInterface<IMoneyModule>();
+                if (money != null)
+                {
+                    if (!money.AmountCovered(remoteClient.AgentId, queryclassifiedPrice))
+                    {
+                        remoteClient.SendAgentAlertMessage("You do not have enough money to create this classified.", false);
+                        return;
+                    }
+                    money.ApplyCharge(remoteClient.AgentId, queryclassifiedPrice, MoneyTransactionType.ClassifiedCharge);
+                }
            }
+            UserClassifiedAdd ad = new UserClassifiedAdd();
+            ad.ParcelName = land == null ? string.Empty : land.LandData.Name;
            ad.CreatorId = remoteClient.AgentId;
            ad.ClassifiedId = queryclassifiedID;
            ad.Category = Convert.ToInt32(queryCategory);
@@ -507,9 +515,7 @@ namespace OpenSim.Region.CoreModules.Avatar.UserProfiles
            if(!rpc.JsonRpcRequest(ref Ad, "classified_update", serverURI, UUID.Random().ToString()))
            {
-                remoteClient.SendAgentAlertMessage(
+                remoteClient.SendAgentAlertMessage("Error updating classified", false);
-                        "Error updating classified", false);
-                return;
            }
        }
diff --git a/OpenSim/Region/CoreModules/Framework/EntityTransfer/EntityTransferModule.cs b/OpenSim/Region/CoreModules/Framework/EntityTransfer/EntityTransferModule.cs
index 58f3dde..71a0e52 100644
--- a/OpenSim/Region/CoreModules/Framework/EntityTransfer/EntityTransferModule.cs
+++ b/OpenSim/Region/CoreModules/Framework/EntityTransfer/EntityTransferModule.cs
@@ -478,9 +478,17 @@ namespace OpenSim.Region.CoreModules.Framework.EntityTransfer
            m_entityTransferStateMachine.UpdateInTransit(sp.UUID, AgentTransferState.Transferring);
            sp.ControllingClient.SendTeleportStart(teleportFlags);
+            lookAt.Z = 0f;
+            if(Math.Abs(lookAt.X) < 0.01f && Math.Abs(lookAt.Y) < 0.01f)
+            {
+                lookAt.X = 1.0f;
+                lookAt.Y = 0;
+            }
            sp.ControllingClient.SendLocalTeleport(position, lookAt, teleportFlags);
            sp.TeleportFlags = (Constants.TeleportFlags)teleportFlags;
+            sp.RotateToLookAt(lookAt);
            sp.Velocity = Vector3.Zero;
            sp.Teleport(position);
diff --git a/OpenSim/Region/CoreModules/Framework/InventoryAccess/InventoryAccessModule.cs b/OpenSim/Region/CoreModules/Framework/InventoryAccess/InventoryAccessModule.cs
index 00e2670..fa7803f 100644
--- a/OpenSim/Region/CoreModules/Framework/InventoryAccess/InventoryAccessModule.cs
+++ b/OpenSim/Region/CoreModules/Framework/InventoryAccess/InventoryAccessModule.cs
@@ -261,64 +261,60 @@ namespace OpenSim.Region.CoreModules.Framework.InventoryAccess
        {
            InventoryItemBase item = m_Scene.InventoryService.GetItem(remoteClient.AgentId, itemID);
+            if (item == null)
+            {
+                m_log.ErrorFormat(
+                    "[INVENTORY ACCESS MODULE]: Could not find item {0} for caps inventory update", itemID);
+                return UUID.Zero;
+            }
            if (item.Owner != remoteClient.AgentId)
                return UUID.Zero;
-            if (item != null)
+            if ((InventoryType)item.InvType == InventoryType.Notecard)
            {
-                if ((InventoryType)item.InvType == InventoryType.Notecard)
+                if (!m_Scene.Permissions.CanEditNotecard(itemID, UUID.Zero, remoteClient.AgentId))
                {
-                    if (!m_Scene.Permissions.CanEditNotecard(itemID, UUID.Zero, remoteClient.AgentId))
+                    remoteClient.SendAgentAlertMessage("Insufficient permissions to edit notecard", false);
-                    {
+                    return UUID.Zero;
-                        remoteClient.SendAgentAlertMessage("Insufficient permissions to edit notecard", false);
-                        return UUID.Zero;
-                    }
-                    remoteClient.SendAlertMessage("Notecard saved");
                }
-                else if ((InventoryType)item.InvType == InventoryType.LSL)
-                {
-                    if (!m_Scene.Permissions.CanEditScript(itemID, UUID.Zero, remoteClient.AgentId))
-                    {
-                        remoteClient.SendAgentAlertMessage("Insufficient permissions to edit script", false);
-                        return UUID.Zero;
-                    }
-                    remoteClient.SendAlertMessage("Script saved");
+               remoteClient.SendAlertMessage("Notecard saved");
-                }
+            }
-                else if ((CustomInventoryType)item.InvType == CustomInventoryType.AnimationSet)
+            else if ((InventoryType)item.InvType == InventoryType.LSL)
+            {
+                if (!m_Scene.Permissions.CanEditScript(itemID, UUID.Zero, remoteClient.AgentId))
                {
-                    AnimationSet animSet = new AnimationSet(data);
+                    remoteClient.SendAgentAlertMessage("Insufficient permissions to edit script", false);
-                    if (!animSet.Validate(x => {
+                    return UUID.Zero;
+                }
+                remoteClient.SendAlertMessage("Script saved");
+            }
+            else if ((CustomInventoryType)item.InvType == CustomInventoryType.AnimationSet)
+            {
+                AnimationSet animSet = new AnimationSet(data);
+                if (!animSet.Validate(x => {
                        int perms = m_Scene.InventoryService.GetAssetPermissions(remoteClient.AgentId, x);
                        int required = (int)(PermissionMask.Transfer | PermissionMask.Copy);
                        if ((perms & required) != required)
                            return false;
                        return true;
                    }))
-                    {
+                {
-                        data = animSet.ToBytes();
+                    data = animSet.ToBytes();
-                    }
                }
+            }
-                AssetBase asset =
+            AssetBase asset =
-                    CreateAsset(item.Name, item.Description, (sbyte)item.AssetType, data, remoteClient.AgentId.ToString());
+                CreateAsset(item.Name, item.Description, (sbyte)item.AssetType, data, remoteClient.AgentId.ToString());
-                item.AssetID = asset.FullID;
+            item.AssetID = asset.FullID;
-                m_Scene.AssetService.Store(asset);
+            m_Scene.AssetService.Store(asset);
-                m_Scene.InventoryService.UpdateItem(item);
-                // remoteClient.SendInventoryItemCreateUpdate(item);
+            m_Scene.InventoryService.UpdateItem(item);
-                return (asset.FullID);
-            }
-            else
-            {
-                m_log.ErrorFormat(
-                    "[INVENTORY ACCESS MODULE]: Could not find item {0} for caps inventory update",
-                    itemID);
-            }
-            return UUID.Zero;
+            // remoteClient.SendInventoryItemCreateUpdate(item);
+            return (asset.FullID);
        }
        public virtual bool UpdateInventoryItemAsset(UUID ownerID, InventoryItemBase item, AssetBase asset)
diff --git a/OpenSim/Region/CoreModules/Scripting/DynamicTexture/DynamicTextureModule.cs b/OpenSim/Region/CoreModules/Scripting/DynamicTexture/DynamicTextureModule.cs
index a686a4d..665d7f7 100644
--- a/OpenSim/Region/CoreModules/Scripting/DynamicTexture/DynamicTextureModule.cs
+++ b/OpenSim/Region/CoreModules/Scripting/DynamicTexture/DynamicTextureModule.cs
@@ -553,37 +553,44 @@ namespace OpenSim.Region.CoreModules.Scripting.DynamicTexture
                ManagedImage managedImage;
                Image image;
-                if (OpenJPEG.DecodeToImage(frontImage, out managedImage, out image))
+                if (!OpenJPEG.DecodeToImage(frontImage, out managedImage, out image) || image == null)
+                    return null;
+                Bitmap image1 = new Bitmap(image);
+                image.Dispose();
+                
+                if (!OpenJPEG.DecodeToImage(backImage, out managedImage, out image) || image == null)
                {
-                    Bitmap image1 = new Bitmap(image);
+                    image1.Dispose();
+                    return null;
+                }
-                    if (OpenJPEG.DecodeToImage(backImage, out managedImage, out image))
+                Bitmap image2 = new Bitmap(image);
-                    {
+                image.Dispose();
-                        Bitmap image2 = new Bitmap(image);
-                        if (setNewAlpha)
+                if (setNewAlpha)
-                            SetAlpha(ref image1, newAlpha);
+                    SetAlpha(ref image1, newAlpha);
-                        Bitmap joint = MergeBitMaps(image1, image2);
+                using(Bitmap joint = MergeBitMaps(image1, image2))
+                {
+                    image1.Dispose();
+                    image2.Dispose();
-                        byte[] result = new byte[0];
+                    byte[] result = new byte[0];
-                        try
+                    try
-                        {
+                    {
-                            result = OpenJPEG.EncodeFromImage(joint, true);
+                        result = OpenJPEG.EncodeFromImage(joint, true);
-                        }
+                    }
-                        catch (Exception e)
+                    catch (Exception e)
-                        {
+                    {
-                            m_log.ErrorFormat(
+                        m_log.ErrorFormat(
-                                "[DYNAMICTEXTUREMODULE]: OpenJpeg Encode Failed.  Exception {0}{1}",
+                        "[DYNAMICTEXTUREMODULE]: OpenJpeg Encode Failed.  Exception {0}{1}",
                                e.Message, e.StackTrace);
-                        }
-                        return result;
                    }
-                }
-                return null;
+                    return result;
+                }
            }
            public Bitmap MergeBitMaps(Bitmap front, Bitmap back)
@@ -592,12 +599,12 @@ namespace OpenSim.Region.CoreModules.Scripting.DynamicTexture
                Graphics jG;
                joint = new Bitmap(back.Width, back.Height, PixelFormat.Format32bppArgb);
-                jG = Graphics.FromImage(joint);
+                using(jG = Graphics.FromImage(joint))
+                {
-                jG.DrawImage(back, 0, 0, back.Width, back.Height);
+                    jG.DrawImage(back, 0, 0, back.Width, back.Height);
-                jG.DrawImage(front, 0, 0, back.Width, back.Height);
+                    jG.DrawImage(front, 0, 0, back.Width, back.Height);
+                    return joint;
-                return joint;
+                }
            }
            private void SetAlpha(ref Bitmap b, byte alpha)
diff --git a/OpenSim/Region/CoreModules/Scripting/WorldComm/WorldCommModule.cs b/OpenSim/Region/CoreModules/Scripting/WorldComm/WorldCommModule.cs
index 68ca2ad..483c25f 100644
--- a/OpenSim/Region/CoreModules/Scripting/WorldComm/WorldCommModule.cs
+++ b/OpenSim/Region/CoreModules/Scripting/WorldComm/WorldCommModule.cs
@@ -559,9 +559,9 @@ namespace OpenSim.Region.CoreModules.Scripting.WorldComm
                return coll[0].GetHandle();
            }
-            if (m_curlisteners < m_maxlisteners)
+            lock (m_listeners)
            {
-                lock (m_listeners)
+                if (m_curlisteners < m_maxlisteners)
                {
                    int newHandle = GetNewHandle(itemID);
diff --git a/OpenSim/Region/CoreModules/ServiceConnectorsIn/Land/LandServiceInConnectorModule.cs b/OpenSim/Region/CoreModules/ServiceConnectorsIn/Land/LandServiceInConnectorModule.cs
index 2fd21be..b632146 100644
--- a/OpenSim/Region/CoreModules/ServiceConnectorsIn/Land/LandServiceInConnectorModule.cs
+++ b/OpenSim/Region/CoreModules/ServiceConnectorsIn/Land/LandServiceInConnectorModule.cs
@@ -126,13 +126,27 @@ namespace OpenSim.Region.CoreModules.ServiceConnectorsIn.Land
        public LandData GetLandData(UUID scopeID, ulong regionHandle, uint x, uint y, out byte regionAccess)
        {
-            m_log.DebugFormat("[LAND IN CONNECTOR]: GetLandData for {0}. Count = {1}",
+//            m_log.DebugFormat("[LAND IN CONNECTOR]: GetLandData for {0}. Count = {1}",
-                regionHandle, m_Scenes.Count);
+//                regionHandle, m_Scenes.Count);
+            uint rx = 0, ry = 0;
+            Util.RegionHandleToWorldLoc(regionHandle, out rx, out ry);
            foreach (Scene s in m_Scenes)
            {
-                if (s.RegionInfo.RegionHandle == regionHandle)
+                uint t = s.RegionInfo.WorldLocX;
+                if( rx < t)
+                    continue;
+                t += s.RegionInfo.RegionSizeX;
+                if( rx >= t)
+                    continue;
+                t = s.RegionInfo.WorldLocY;
+                if( ry < t)
+                    continue;
+                t += s.RegionInfo.RegionSizeY;
+                if( ry  < t)
                {
-                    m_log.Debug("[LAND IN CONNECTOR]: Found region to GetLandData from");
+//                    m_log.Debug("[LAND IN CONNECTOR]: Found region to GetLandData from");
                    regionAccess = s.RegionInfo.AccessLevel;
                    return s.GetLandData(x, y);
                }
diff --git a/OpenSim/Region/CoreModules/ServiceConnectorsOut/Asset/HGAssetBroker.cs b/OpenSim/Region/CoreModules/ServiceConnectorsOut/Asset/HGAssetBroker.cs
index ade6381..9eb41f9 100644
--- a/OpenSim/Region/CoreModules/ServiceConnectorsOut/Asset/HGAssetBroker.cs
+++ b/OpenSim/Region/CoreModules/ServiceConnectorsOut/Asset/HGAssetBroker.cs
@@ -367,12 +367,14 @@ namespace OpenSim.Region.CoreModules.ServiceConnectorsOut.Asset
            if (String.IsNullOrEmpty(id))
                return string.Empty;
            
-            asset.ID = id;
+           if(asset.ID != id)
+           {
-            if (isHG && m_Cache != null)
+                asset.ID = id;
-                m_Cache.Cache(asset);
+                if (m_Cache != null)
+                    m_Cache.Cache(asset);
+           }
-            return id;
+           return id;
        }
        public bool UpdateContent(string id, byte[] data)
diff --git a/OpenSim/Region/CoreModules/ServiceConnectorsOut/Land/LocalLandServiceConnector.cs b/OpenSim/Region/CoreModules/ServiceConnectorsOut/Land/LocalLandServiceConnector.cs
index 5329933..9e251aa 100644
--- a/OpenSim/Region/CoreModules/ServiceConnectorsOut/Land/LocalLandServiceConnector.cs
+++ b/OpenSim/Region/CoreModules/ServiceConnectorsOut/Land/LocalLandServiceConnector.cs
@@ -121,12 +121,25 @@ namespace OpenSim.Region.CoreModules.ServiceConnectorsOut.Land
        public LandData GetLandData(UUID scopeID, ulong regionHandle, uint x, uint y, out byte regionAccess)
        {
            regionAccess = 2;
-            m_log.DebugFormat("[LAND CONNECTOR]: request for land data in {0} at {1}, {2}",
+//            m_log.DebugFormat("[LAND CONNECTOR]: request for land data in {0} at {1}, {2}",
-                  regionHandle, x, y);
+//                  regionHandle, x, y);
+            uint rx = 0, ry = 0;
+            Util.RegionHandleToWorldLoc(regionHandle, out rx, out ry);
            foreach (Scene s in m_Scenes)
            {
-                if (s.RegionInfo.RegionHandle == regionHandle)
+                uint t = s.RegionInfo.WorldLocX;
+                if( rx < t)
+                    continue;
+                t += s.RegionInfo.RegionSizeX;
+                if( rx >= t)
+                    continue;
+                t = s.RegionInfo.WorldLocY;
+                if( ry < t)
+                    continue;
+                t += s.RegionInfo.RegionSizeY;
+                if( ry  < t)
                {
                    LandData land = s.GetLandData(x, y);
                    regionAccess = s.RegionInfo.AccessLevel;
diff --git a/OpenSim/Region/CoreModules/World/Archiver/ArchiveReadRequest.cs b/OpenSim/Region/CoreModules/World/Archiver/ArchiveReadRequest.cs
index 839072e..2d590fc 100644
--- a/OpenSim/Region/CoreModules/World/Archiver/ArchiveReadRequest.cs
+++ b/OpenSim/Region/CoreModules/World/Archiver/ArchiveReadRequest.cs
@@ -1193,6 +1193,8 @@ namespace OpenSim.Region.CoreModules.World.Archiver
            }
            ControlFileLoaded = true;
+            if(xtr != null)
+                xtr.Close();
            return dearchivedScenes;
        }
diff --git a/OpenSim/Region/CoreModules/World/Estate/EstateManagementModule.cs b/OpenSim/Region/CoreModules/World/Estate/EstateManagementModule.cs
index 56d41a8..425562f 100644
--- a/OpenSim/Region/CoreModules/World/Estate/EstateManagementModule.cs
+++ b/OpenSim/Region/CoreModules/World/Estate/EstateManagementModule.cs
@@ -1229,15 +1229,24 @@ namespace OpenSim.Region.CoreModules.World.Estate
                }
                terr.SaveToFile(Util.dataDir() + "/terrain.raw");
-                FileStream input = new FileStream(Util.dataDir() + "/terrain.raw", FileMode.Open);
+                byte[] bdata;
-                byte[] bdata = new byte[input.Length];
+                using(FileStream input = new FileStream(Util.dataDir() + "/terrain.raw",FileMode.Open))
-                input.Read(bdata, 0, (int)input.Length);
+                {
+                    bdata = new byte[input.Length];
+                    input.Read(bdata, 0, (int)input.Length);
+                }
+                if(bdata == null || bdata.Length == 0)
+                {
+                    remote_client.SendAlertMessage("Terrain error");
+                    return;
+                }
                remote_client.SendAlertMessage("Terrain file written, starting download...");
-                Scene.XferManager.AddNewFile("terrain.raw", bdata);
+                string xfername = (UUID.Random()).ToString();
+                Scene.XferManager.AddNewFile(xfername, bdata);
                m_log.DebugFormat("[CLIENT]: Sending terrain for region {0} to {1}", Scene.Name, remote_client.Name);
+                remote_client.SendInitiateDownload(xfername, clientFileName);
-                remote_client.SendInitiateDownload("terrain.raw", clientFileName);
            }
        }
diff --git a/OpenSim/Region/CoreModules/World/LegacyMap/MapImageModule.cs b/OpenSim/Region/CoreModules/World/LegacyMap/MapImageModule.cs
index 5155804..1f2b7c4 100644
--- a/OpenSim/Region/CoreModules/World/LegacyMap/MapImageModule.cs
+++ b/OpenSim/Region/CoreModules/World/LegacyMap/MapImageModule.cs
@@ -382,7 +382,7 @@ namespace OpenSim.Region.CoreModules.World.LegacyMap
                                    Vector3 pos = part.GetWorldPosition();
-                                    // skip prim outside of retion
+                                    // skip prim outside of region
                                    if (!m_scene.PositionIsInCurrentRegion(pos))
                                        continue;
@@ -406,12 +406,13 @@ namespace OpenSim.Region.CoreModules.World.LegacyMap
                                    {
                                        // Translate scale by rotation so scale is represented properly when object is rotated
                                        Vector3 lscale = new Vector3(part.Shape.Scale.X, part.Shape.Scale.Y, part.Shape.Scale.Z);
+                                        lscale *= 0.5f;
                                        Vector3 scale = new Vector3();
                                        Vector3 tScale = new Vector3();
                                        Vector3 axPos = new Vector3(pos.X, pos.Y, pos.Z);
-                                        Quaternion llrot = part.GetWorldRotation();
+                                        Quaternion rot = part.GetWorldRotation();
-                                        Quaternion rot = new Quaternion(llrot.W, llrot.X, llrot.Y, llrot.Z);
                                        scale = lscale * rot;
                                        // negative scales don't work in this situation
@@ -470,7 +471,6 @@ namespace OpenSim.Region.CoreModules.World.LegacyMap
                                        tScale = new Vector3(lscale.X, -lscale.Y, -lscale.Z);
                                        scale = ((tScale * rot));
                                        vertexes[2] = (new Vector3((pos.X + scale.X), (pos.Y + scale.Y), (pos.Z + scale.Z)));
                                        //vertexes[2].x = pos.X + vertexes[2].x;
diff --git a/OpenSim/Region/CoreModules/World/Terrain/FileLoaders/BMP.cs b/OpenSim/Region/CoreModules/World/Terrain/FileLoaders/BMP.cs
index fb57c82..ec2d085 100644
--- a/OpenSim/Region/CoreModules/World/Terrain/FileLoaders/BMP.cs
+++ b/OpenSim/Region/CoreModules/World/Terrain/FileLoaders/BMP.cs
@@ -47,9 +47,8 @@ namespace OpenSim.Region.CoreModules.World.Terrain.FileLoaders
        /// <param name="map">The terrain channel being saved</param>
        public override void SaveFile(string filename, ITerrainChannel map)
        {
-            Bitmap colours = CreateGrayscaleBitmapFromMap(map);
+            using(Bitmap colours = CreateGrayscaleBitmapFromMap(map))
+                colours.Save(filename,ImageFormat.Bmp);
-            colours.Save(filename, ImageFormat.Bmp);
        }
        /// <summary>
@@ -59,9 +58,8 @@ namespace OpenSim.Region.CoreModules.World.Terrain.FileLoaders
        /// <param name="map">The terrain channel being saved</param>
        public override void SaveStream(Stream stream, ITerrainChannel map)
        {
-            Bitmap colours = CreateGrayscaleBitmapFromMap(map);
+            using(Bitmap colours = CreateGrayscaleBitmapFromMap(map))
+                colours.Save(stream,ImageFormat.Bmp);
-            colours.Save(stream, ImageFormat.Png);
        }
        /// <summary>
diff --git a/OpenSim/Region/CoreModules/World/Terrain/FileLoaders/GIF.cs b/OpenSim/Region/CoreModules/World/Terrain/FileLoaders/GIF.cs
index 79cc50b..3843708 100644
--- a/OpenSim/Region/CoreModules/World/Terrain/FileLoaders/GIF.cs
+++ b/OpenSim/Region/CoreModules/World/Terrain/FileLoaders/GIF.cs
@@ -36,9 +36,8 @@ namespace OpenSim.Region.CoreModules.World.Terrain.FileLoaders
    {
        public override void SaveFile(string filename, ITerrainChannel map)
        {
-            Bitmap colours = CreateGrayscaleBitmapFromMap(map);
+            using(Bitmap colours = CreateGrayscaleBitmapFromMap(map))
+                colours.Save(filename,ImageFormat.Gif);
-            colours.Save(filename, ImageFormat.Gif);
        }
        /// <summary>
@@ -48,9 +47,8 @@ namespace OpenSim.Region.CoreModules.World.Terrain.FileLoaders
        /// <param name="map">The terrain channel being saved</param>
        public override void SaveStream(Stream stream, ITerrainChannel map)
        {
-            Bitmap colours = CreateGrayscaleBitmapFromMap(map);
+            using(Bitmap colours = CreateGrayscaleBitmapFromMap(map))
+                colours.Save(stream,ImageFormat.Gif);
-            colours.Save(stream, ImageFormat.Gif);
        }
        public override string ToString()
diff --git a/OpenSim/Region/CoreModules/World/Terrain/FileLoaders/GenericSystemDrawing.cs b/OpenSim/Region/CoreModules/World/Terrain/FileLoaders/GenericSystemDrawing.cs
index e8c719a..1e67f72 100644
--- a/OpenSim/Region/CoreModules/World/Terrain/FileLoaders/GenericSystemDrawing.cs
+++ b/OpenSim/Region/CoreModules/World/Terrain/FileLoaders/GenericSystemDrawing.cs
@@ -59,7 +59,7 @@ namespace OpenSim.Region.CoreModules.World.Terrain.FileLoaders
        /// <returns>A terrain channel generated from the image.</returns>
        public virtual ITerrainChannel LoadFile(string filename)
        {
-            using (Bitmap b = new Bitmap(filename))
+            using(Bitmap b = new Bitmap(filename))
                return LoadBitmap(b);
        }
@@ -111,9 +111,8 @@ namespace OpenSim.Region.CoreModules.World.Terrain.FileLoaders
        /// <param name="map">The terrain channel being saved</param>
        public virtual void SaveFile(string filename, ITerrainChannel map)
        {
-            Bitmap colours = CreateGrayscaleBitmapFromMap(map);
+            using(Bitmap colours = CreateGrayscaleBitmapFromMap(map))
+                colours.Save(filename,ImageFormat.Png);
-            colours.Save(filename, ImageFormat.Png);
        }
        /// <summary>
@@ -123,9 +122,8 @@ namespace OpenSim.Region.CoreModules.World.Terrain.FileLoaders
        /// <param name="map">The terrain channel being saved</param>
        public virtual void SaveStream(Stream stream, ITerrainChannel map)
        {
-            Bitmap colours = CreateGrayscaleBitmapFromMap(map);
+            using(Bitmap colours = CreateGrayscaleBitmapFromMap(map))
+                colours.Save(stream,ImageFormat.Png);
-            colours.Save(stream, ImageFormat.Png);
        }
        public virtual void SaveFile(ITerrainChannel m_channel, string filename,
diff --git a/OpenSim/Region/CoreModules/World/Terrain/FileLoaders/JPEG.cs b/OpenSim/Region/CoreModules/World/Terrain/FileLoaders/JPEG.cs
index 9cc767a..36c2bbf 100644
--- a/OpenSim/Region/CoreModules/World/Terrain/FileLoaders/JPEG.cs
+++ b/OpenSim/Region/CoreModules/World/Terrain/FileLoaders/JPEG.cs
@@ -59,9 +59,8 @@ namespace OpenSim.Region.CoreModules.World.Terrain.FileLoaders
        public void SaveFile(string filename, ITerrainChannel map)
        {
-            Bitmap colours = CreateBitmapFromMap(map);
+            using(Bitmap colours = CreateBitmapFromMap(map))
+                colours.Save(filename,ImageFormat.Jpeg);
-            colours.Save(filename, ImageFormat.Jpeg);
        }
        /// <summary>
@@ -71,9 +70,8 @@ namespace OpenSim.Region.CoreModules.World.Terrain.FileLoaders
        /// <param name="map">The terrain channel being saved</param>
        public void SaveStream(Stream stream, ITerrainChannel map)
        {
-            Bitmap colours = CreateBitmapFromMap(map);
+            using(Bitmap colours = CreateBitmapFromMap(map))
+                colours.Save(stream,ImageFormat.Jpeg);
-            colours.Save(stream, ImageFormat.Jpeg);
        }
        public virtual void SaveFile(ITerrainChannel m_channel, string filename,
diff --git a/OpenSim/Region/CoreModules/World/Terrain/FileLoaders/PNG.cs b/OpenSim/Region/CoreModules/World/Terrain/FileLoaders/PNG.cs
index c5c12ae..8ea8e9d 100644
--- a/OpenSim/Region/CoreModules/World/Terrain/FileLoaders/PNG.cs
+++ b/OpenSim/Region/CoreModules/World/Terrain/FileLoaders/PNG.cs
@@ -36,9 +36,8 @@ namespace OpenSim.Region.CoreModules.World.Terrain.FileLoaders
    {
        public override void SaveFile(string filename, ITerrainChannel map)
        {
-            Bitmap colours = CreateGrayscaleBitmapFromMap(map);
+            using(Bitmap colours = CreateGrayscaleBitmapFromMap(map))
+                colours.Save(filename,ImageFormat.Png);
-            colours.Save(filename, ImageFormat.Png);
        }
        /// <summary>
@@ -48,9 +47,8 @@ namespace OpenSim.Region.CoreModules.World.Terrain.FileLoaders
        /// <param name="map">The terrain channel being saved</param>
        public override void SaveStream(Stream stream, ITerrainChannel map)
        {
-            Bitmap colours = CreateGrayscaleBitmapFromMap(map);
+            using(Bitmap colours = CreateGrayscaleBitmapFromMap(map))
+                colours.Save(stream,ImageFormat.Png);
-            colours.Save(stream, ImageFormat.Png);
        }
        public override string ToString()
diff --git a/OpenSim/Region/CoreModules/World/Terrain/FileLoaders/TIFF.cs b/OpenSim/Region/CoreModules/World/Terrain/FileLoaders/TIFF.cs
index b416b82..d103a6f 100644
--- a/OpenSim/Region/CoreModules/World/Terrain/FileLoaders/TIFF.cs
+++ b/OpenSim/Region/CoreModules/World/Terrain/FileLoaders/TIFF.cs
@@ -36,9 +36,8 @@ namespace OpenSim.Region.CoreModules.World.Terrain.FileLoaders
    {
        public override void SaveFile(string filename, ITerrainChannel map)
        {
-            Bitmap colours = CreateGrayscaleBitmapFromMap(map);
+            using(Bitmap colours = CreateGrayscaleBitmapFromMap(map))
+                colours.Save(filename,ImageFormat.Tiff);
-            colours.Save(filename, ImageFormat.Tiff);
        }
        /// <summary>
@@ -48,9 +47,8 @@ namespace OpenSim.Region.CoreModules.World.Terrain.FileLoaders
        /// <param name="map">The terrain channel being saved</param>
        public override void SaveStream(Stream stream, ITerrainChannel map)
        {
-            Bitmap colours = CreateGrayscaleBitmapFromMap(map);
+            using(Bitmap colours = CreateGrayscaleBitmapFromMap(map))
+                colours.Save(stream,ImageFormat.Tiff);
-            colours.Save(stream, ImageFormat.Tiff);
        }
        public override string ToString()
diff --git a/OpenSim/Region/CoreModules/World/Terrain/TerrainModule.cs b/OpenSim/Region/CoreModules/World/Terrain/TerrainModule.cs
index 275aa2a..05d18da 100644
--- a/OpenSim/Region/CoreModules/World/Terrain/TerrainModule.cs
+++ b/OpenSim/Region/CoreModules/World/Terrain/TerrainModule.cs
@@ -963,6 +963,27 @@ namespace OpenSim.Region.CoreModules.World.Terrain
            return wasLimited;
        }
+        private bool EnforceEstateLimits(int startX, int startY, int endX, int endY)
+        {
+            TerrainData terrData = m_channel.GetTerrainData();
+            bool wasLimited = false;
+            for (int x = startX; x <= endX; x += Constants.TerrainPatchSize)
+            {
+                for (int y = startX; y <= endY; y += Constants.TerrainPatchSize)
+                {
+                    if (terrData.IsTaintedAt(x, y, false /* clearOnTest */))
+                   {
+                        // If we should respect the estate settings then
+                        //     fixup and height deltas that don't respect them.
+                        // Note that LimitChannelChanges() modifies the TerrainChannel with the limited height values.
+                        wasLimited |= LimitChannelChanges(terrData, x, y);
+                    }
+                }
+            }
+            return wasLimited;
+        }
        /// <summary>
        /// Checks to see height deltas in the tainted terrain patch at xStart ,yStart
        /// are all within the current estate limits
@@ -1341,7 +1362,7 @@ namespace OpenSim.Region.CoreModules.World.Terrain
                        //block changes outside estate limits
                        if (!god)
-                            EnforceEstateLimits();
+                            EnforceEstateLimits(startX, endX, startY, endY);
                    }
                }
                else
@@ -1404,7 +1425,7 @@ namespace OpenSim.Region.CoreModules.World.Terrain
                        //block changes outside estate limits
                        if (!god)
-                            EnforceEstateLimits();
+                            EnforceEstateLimits(startX, endX, startY, endY);
                    }
                }
                else
diff --git a/OpenSim/Region/CoreModules/World/Warp3DMap/Warp3DImageModule.cs b/OpenSim/Region/CoreModules/World/Warp3DMap/Warp3DImageModule.cs
index 443eee1..cb37067 100644
--- a/OpenSim/Region/CoreModules/World/Warp3DMap/Warp3DImageModule.cs
+++ b/OpenSim/Region/CoreModules/World/Warp3DMap/Warp3DImageModule.cs
@@ -35,7 +35,7 @@ using System.Reflection;
 using CSJ2K;
 using Nini.Config;
 using log4net;
-using Rednettle.Warp3D;
+using Warp3D;
 using Mono.Addins;
 using OpenSim.Framework;
@@ -76,11 +76,10 @@ namespace OpenSim.Region.CoreModules.World.Warp3DMap
        private bool m_texturePrims = true;     // true if should texture the rendered prims
        private float m_texturePrimSize = 48f;  // size of prim before we consider texturing it
        private bool m_renderMeshes = false;    // true if to render meshes rather than just bounding boxes
-        private bool m_useAntiAliasing = false; // true if to anti-alias the rendered image
        private bool m_Enabled = false;
-        private Bitmap lastImage = null;
+//        private Bitmap lastImage = null;
        private DateTime lastImageTime = DateTime.MinValue;
        #region Region Module interface
@@ -107,10 +106,7 @@ namespace OpenSim.Region.CoreModules.World.Warp3DMap
                = Util.GetConfigVarFromSections<float>(m_config, "TexturePrimSize", configSections, m_texturePrimSize);
            m_renderMeshes
                = Util.GetConfigVarFromSections<bool>(m_config, "RenderMeshes", configSections, m_renderMeshes);
-            m_useAntiAliasing
+         }
-                = Util.GetConfigVarFromSections<bool>(m_config, "UseAntiAliasing", configSections, m_useAntiAliasing);
-        }
        public void AddRegion(Scene scene)
        {
@@ -201,21 +197,14 @@ namespace OpenSim.Region.CoreModules.World.Warp3DMap
            int width = viewport.Width;
            int height = viewport.Height;
-            if (m_useAntiAliasing)
-            {
-                width *= 2;
-                height *= 2;
-            }
            WarpRenderer renderer = new WarpRenderer();
-            renderer.CreateScene(width, height);
+            if(!renderer.CreateScene(width, height))
-            renderer.Scene.autoCalcNormals = false;
+                return new Bitmap(width,height);
            #region Camera
            warp_Vector pos = ConvertVector(viewport.Position);
-            pos.z -= 0.001f; // Works around an issue with the Warp3D camera
            warp_Vector lookat = warp_Vector.add(ConvertVector(viewport.Position), ConvertVector(viewport.LookDirection));
            renderer.Scene.defaultCamera.setPos(pos);
@@ -223,9 +212,7 @@ namespace OpenSim.Region.CoreModules.World.Warp3DMap
            if (viewport.Orthographic)
            {
-                renderer.Scene.defaultCamera.isOrthographic = true;
+                renderer.Scene.defaultCamera.setOrthographic(true,viewport.OrthoWindowWidth, viewport.OrthoWindowHeight);
-                renderer.Scene.defaultCamera.orthoViewWidth = viewport.OrthoWindowWidth;
-                renderer.Scene.defaultCamera.orthoViewHeight = viewport.OrthoWindowHeight;
            }
            else
            {
@@ -247,24 +234,8 @@ namespace OpenSim.Region.CoreModules.World.Warp3DMap
            renderer.Render();
            Bitmap bitmap = renderer.Scene.getImage();
-            if (m_useAntiAliasing)
+            renderer.Scene.destroy();
-            {
+            renderer.Reset();
-                using (Bitmap origBitmap = bitmap)
-                    bitmap = ImageUtils.ResizeImage(origBitmap, viewport.Width, viewport.Height);
-            }
-            // XXX: It shouldn't really be necesary to force a GC here as one should occur anyway pretty shortly
-            // afterwards.  It's generally regarded as a bad idea to manually GC.  If Warp3D is using lots of memory
-            // then this may be some issue with the Warp3D code itself, though it's also quite possible that generating
-            // this map tile simply takes a lot of memory.
-            foreach (var o in renderer.Scene.objectData.Values)
-            {
-                warp_Object obj = (warp_Object)o;
-                obj.vertexData = null;
-                obj.triangleData = null;
-            }
-            renderer.Scene.removeAllObjects();
            renderer = null;
            viewport = null;
@@ -301,9 +272,9 @@ namespace OpenSim.Region.CoreModules.World.Warp3DMap
            float waterHeight = (float)m_scene.RegionInfo.RegionSettings.WaterHeight;
            renderer.AddPlane("Water", m_scene.RegionInfo.RegionSizeX * 0.5f);
-            renderer.Scene.sceneobject("Water").setPos(m_scene.RegionInfo.RegionSizeX / 2 - 0.5f,
+            renderer.Scene.sceneobject("Water").setPos(m_scene.RegionInfo.RegionSizeX * 0.5f - 0.5f,
                                                       waterHeight,
-                                                       m_scene.RegionInfo.RegionSizeY / 2 - 0.5f);
+                                                       m_scene.RegionInfo.RegionSizeY * 0.5f - 0.5f);
            warp_Material waterColorMaterial = new warp_Material(ConvertColor(WATER_COLOR));
                        waterColorMaterial.setReflectivity(0);  // match water color with standard map module thanks lkalif
@@ -319,53 +290,53 @@ namespace OpenSim.Region.CoreModules.World.Warp3DMap
        {
            ITerrainChannel terrain = m_scene.Heightmap;
+            float regionsx = m_scene.RegionInfo.RegionSizeX;
+            float regionsy = m_scene.RegionInfo.RegionSizeY;
+            
            // 'diff' is the difference in scale between the real region size and the size of terrain we're buiding
-            float diff = (float)m_scene.RegionInfo.RegionSizeX / 256f;
+            float diff = regionsx / 256f;
-            warp_Object obj = new warp_Object(256 * 256, 255 * 255 * 2);
+            int npointsx =(int)(regionsx / diff);
+            int npointsy =(int)(regionsy / diff);
+            float invsx = 1.0f / regionsx;
+            float invsy = 1.0f / (float)m_scene.RegionInfo.RegionSizeY;
            // Create all the vertices for the terrain
-            for (float y = 0; y < m_scene.RegionInfo.RegionSizeY; y += diff)
+            warp_Object obj = new warp_Object();
+            for (float y = 0; y < regionsy; y += diff)
            {
-                for (float x = 0; x < m_scene.RegionInfo.RegionSizeX; x += diff)
+                for (float x = 0; x < regionsx; x += diff)
                {
-                    warp_Vector pos = ConvertVector(x, y, (float)terrain[(int)x, (int)y]);
+                    warp_Vector pos = ConvertVector(x , y , (float)terrain[(int)x, (int)y]);
-                    obj.addVertex(new warp_Vertex(pos,
+                    obj.addVertex(new warp_Vertex(pos, x *  invsx, 1.0f - y * invsy));
-                        x / (float)m_scene.RegionInfo.RegionSizeX,
-                        (((float)m_scene.RegionInfo.RegionSizeY) - y) / m_scene.RegionInfo.RegionSizeY));
                }
            }
-            // Now that we have all the vertices, make another pass and create
+            // Now that we have all the vertices, make another pass and
-            //     the normals for each of the surface triangles and
+            // create the list of triangle indices.
-            //     create the list of triangle indices.
+            float invdiff = 1.0f / diff;
-            for (float y = 0; y < m_scene.RegionInfo.RegionSizeY; y += diff)
+            int limx = npointsx - 1;
+            int limy = npointsy - 1;
+            for (float y = 0; y < regionsy; y += diff)
            {
-                for (float x = 0; x < m_scene.RegionInfo.RegionSizeX; x += diff)
+                for (float x = 0; x < regionsx; x += diff)
                {
-                    float newX = x / diff;
+                    float newX = x * invdiff;
-                    float newY = y / diff;
+                    float newY = y * invdiff;
-                    if (newX < 255 && newY < 255)
+                    if (newX < limx && newY < limy)
                    {
-                        int v = (int)newY * 256 + (int)newX;
+                        int v = (int)newY * npointsx + (int)newX;
-                        // Normal for a triangle made up of three adjacent vertices
-                        Vector3 v1 = new Vector3(newX, newY, (float)terrain[(int)x, (int)y]);
-                        Vector3 v2 = new Vector3(newX + 1, newY, (float)terrain[(int)(x + 1), (int)y]);
-                        Vector3 v3 = new Vector3(newX, newY + 1, (float)terrain[(int)x, ((int)(y + 1))]);
-                        warp_Vector norm = ConvertVector(SurfaceNormal(v1, v2, v3));
-                        norm = norm.reverse();
-                        obj.vertex(v).n = norm;
                        // Make two triangles for each of the squares in the grid of vertices
                        obj.addTriangle(
                            v,
                            v + 1,
-                            v + 256);
+                            v + npointsx);
                        obj.addTriangle(
-                            v + 256 + 1,
+                            v + npointsx + 1,
-                            v + 256,
+                            v + npointsx,
                            v + 1);
                    }
                }
@@ -398,14 +369,10 @@ namespace OpenSim.Region.CoreModules.World.Warp3DMap
            Util.RegionHandleToWorldLoc(m_scene.RegionInfo.RegionHandle, out globalX, out globalY);
            warp_Texture texture;
-            using (
+            using (Bitmap image = TerrainSplat.Splat(
-                Bitmap image
-                    = TerrainSplat.Splat(
                        terrain, textureIDs, startHeights, heightRanges,
                        new Vector3d(globalX, globalY, 0.0), m_scene.AssetService, textureTerrain))
-            {
                texture = new warp_Texture(image);
-            }
            warp_Material material = new warp_Material(texture);
            material.setReflectivity(50);
@@ -431,11 +398,13 @@ namespace OpenSim.Region.CoreModules.World.Warp3DMap
        private void CreatePrim(WarpRenderer renderer, SceneObjectPart prim,
                bool useTextures)
        {
-            const float MIN_SIZE = 2f;
+            const float MIN_SIZE_SQUARE = 4f;
            if ((PCode)prim.Shape.PCode != PCode.Prim)
                return;
-            if (prim.Scale.LengthSquared() < MIN_SIZE * MIN_SIZE)
+            float primScaleLenSquared = prim.Scale.LengthSquared();
+            if (primScaleLenSquared < MIN_SIZE_SQUARE)
                return;
            FacetedMesh renderMesh = null;
@@ -459,13 +428,13 @@ namespace OpenSim.Region.CoreModules.World.Warp3DMap
                        else // It's sculptie
                        {
                            IJ2KDecoder imgDecoder = m_scene.RequestModuleInterface<IJ2KDecoder>();
-                            if (imgDecoder != null)
+                            if(imgDecoder != null)
                            {
                                Image sculpt = imgDecoder.DecodeToImage(sculptAsset);
-                                if (sculpt != null)
+                                if(sculpt != null)
                                {
-                                    renderMesh = m_primMesher.GenerateFacetedSculptMesh(omvPrim, (Bitmap)sculpt,
+                                    renderMesh = m_primMesher.GenerateFacetedSculptMesh(omvPrim,(Bitmap)sculpt,
-                                                                                        DetailLevel.Medium);
+                                                                                            DetailLevel.Medium);
                                    sculpt.Dispose();
                                }
                            }
@@ -483,20 +452,6 @@ namespace OpenSim.Region.CoreModules.World.Warp3DMap
            if (renderMesh == null)
                return;
-            warp_Vector primPos = ConvertVector(prim.GetWorldPosition());
-            warp_Quaternion primRot = ConvertQuaternion(prim.RotationOffset);
-            warp_Matrix m = warp_Matrix.quaternionMatrix(primRot);
-            if (prim.ParentID != 0)
-            {
-                SceneObjectGroup group = m_scene.SceneGraph.GetGroupByPrim(prim.LocalId);
-                if (group != null)
-                    m.transform(warp_Matrix.quaternionMatrix(ConvertQuaternion(group.RootPart.RotationOffset)));
-            }
-            warp_Vector primScale = ConvertVector(prim.Scale);
            string primID = prim.UUID.ToString();
            // Create the prim faces
@@ -504,27 +459,18 @@ namespace OpenSim.Region.CoreModules.World.Warp3DMap
            for (int i = 0; i < renderMesh.Faces.Count; i++)
            {
                Face face = renderMesh.Faces[i];
-                string meshName = primID + "-Face-" + i.ToString();
+                string meshName = primID + i.ToString();
                // Avoid adding duplicate meshes to the scene
                if (renderer.Scene.objectData.ContainsKey(meshName))
-                {
                    continue;
-                }
-                warp_Object faceObj = new warp_Object(face.Vertices.Count, face.Indices.Count / 3);
+                warp_Object faceObj = new warp_Object();
                for (int j = 0; j < face.Vertices.Count; j++)
                {
                    Vertex v = face.Vertices[j];
                    warp_Vector pos = ConvertVector(v.Position);
-                    warp_Vector norm = ConvertVector(v.Normal);
+                    warp_Vertex vert = new warp_Vertex(pos, v.TexCoord.X, v.TexCoord.Y);
-                    
-                    if (prim.Shape.SculptTexture == UUID.Zero)
-                        norm = norm.reverse();
-                    warp_Vertex vert = new warp_Vertex(pos, norm, v.TexCoord.X, v.TexCoord.Y);
                    faceObj.addVertex(vert);
                }
@@ -539,17 +485,19 @@ namespace OpenSim.Region.CoreModules.World.Warp3DMap
                Primitive.TextureEntryFace teFace = prim.Shape.Textures.GetFace((uint)i);
                Color4 faceColor = GetFaceColor(teFace);
                string materialName = String.Empty;
-                if (m_texturePrims && prim.Scale.LengthSquared() > m_texturePrimSize*m_texturePrimSize)
+                if (m_texturePrims && primScaleLenSquared > m_texturePrimSize*m_texturePrimSize)
                    materialName = GetOrCreateMaterial(renderer, faceColor, teFace.TextureID);
                else
                    materialName = GetOrCreateMaterial(renderer, faceColor);
+                warp_Vector primPos = ConvertVector(prim.GetWorldPosition());
+                warp_Quaternion primRot = ConvertQuaternion(prim.GetWorldRotation());
+                warp_Matrix m = warp_Matrix.quaternionMatrix(primRot);
                faceObj.transform(m);
                faceObj.setPos(primPos);
-                faceObj.scaleSelf(primScale.x, primScale.y, primScale.z);
+                faceObj.scaleSelf(prim.Scale.X, prim.Scale.Z, prim.Scale.Y);
                renderer.Scene.addObject(meshName, faceObj);
                renderer.SetObjectMaterial(meshName, materialName);
            }
        }
diff --git a/OpenSim/Region/CoreModules/World/WorldMap/WorldMapModule.cs b/OpenSim/Region/CoreModules/World/WorldMap/WorldMapModule.cs
index 959829c..57ec800 100644
--- a/OpenSim/Region/CoreModules/World/WorldMap/WorldMapModule.cs
+++ b/OpenSim/Region/CoreModules/World/WorldMap/WorldMapModule.cs
@@ -1428,6 +1428,10 @@ namespace OpenSim.Region.CoreModules.World.WorldMap
            mapTexture.Save(exportPath, ImageFormat.Jpeg);
+            g.Dispose();
+            mapTexture.Dispose();
+            sea.Dispose();
            m_log.InfoFormat(
                "[WORLD MAP]: Successfully exported world map for {0} to {1}",
                m_scene.RegionInfo.RegionName, exportPath);
@@ -1613,9 +1617,9 @@ namespace OpenSim.Region.CoreModules.World.WorldMap
                        int mb = bx;
                        if(mb < by)
                            mb = by;
-                        if(mb > 2 * Constants.RegionSize && mb > 0)
+                        if(mb > Constants.RegionSize && mb > 0)
                        {
-                            float scale = 2.0f * (float)Constants.RegionSize/(float)mb;
+                            float scale = (float)Constants.RegionSize/(float)mb;
                            Size newsize = new Size();
                            newsize.Width = (int)(bx * scale);
                            newsize.Height = (int)(by * scale);
diff --git a/OpenSim/Region/Framework/Scenes/Animation/MovementAnimationOverrides.cs b/OpenSim/Region/Framework/Scenes/Animation/MovementAnimationOverrides.cs
index d59678b..ca3ebfb 100644
--- a/OpenSim/Region/Framework/Scenes/Animation/MovementAnimationOverrides.cs
+++ b/OpenSim/Region/Framework/Scenes/Animation/MovementAnimationOverrides.cs
@@ -52,6 +52,7 @@ namespace OpenSim.Region.Framework.Scenes
        private static readonly ILog m_log =
            LogManager.GetLogger(MethodBase.GetCurrentMethod().DeclaringType);
+        private object MAOLock = new object();
        private Dictionary<string, UUID> m_overrides = new Dictionary<string, UUID>();
        public void SetOverride(string state, UUID animID)
        {
@@ -66,13 +67,13 @@ namespace OpenSim.Region.Framework.Scenes
            m_log.DebugFormat("Setting override for {0} to {1}", state, animID);
-            lock (m_overrides)
+            lock (MAOLock)
                m_overrides[state] = animID;
        }
        public UUID GetOverriddenAnimation(string state)
        {
-            lock (m_overrides)
+            lock (MAOLock)
            {
                if (m_overrides.ContainsKey(state))
                    return m_overrides[state];
@@ -83,7 +84,7 @@ namespace OpenSim.Region.Framework.Scenes
        public Dictionary<string, UUID> CloneAOPairs()
        {
-            lock (m_overrides)
+            lock (MAOLock)
            {
                return new Dictionary<string, UUID>(m_overrides);
            }
@@ -91,7 +92,7 @@ namespace OpenSim.Region.Framework.Scenes
        public void CopyAOPairsFrom(Dictionary<string, UUID> src)
        {
-            lock (m_overrides)
+            lock (MAOLock)
            {
                m_overrides.Clear();
                m_overrides = new Dictionary<string, UUID>(src);
diff --git a/OpenSim/Region/Framework/Scenes/CollisionSounds.cs b/OpenSim/Region/Framework/Scenes/CollisionSounds.cs
index 075724e..84817a0 100644
--- a/OpenSim/Region/Framework/Scenes/CollisionSounds.cs
+++ b/OpenSim/Region/Framework/Scenes/CollisionSounds.cs
@@ -128,20 +128,29 @@ namespace OpenSim.Region.Framework.Scenes
            if (part.CollisionSoundType < 0)
                return;
-            float volume = 0.0f;
+            float volume = part.CollisionSoundVolume;
-            bool HaveSound = false;
            UUID soundID = part.CollisionSound;
-            if (part.CollisionSoundType > 0)
+            bool HaveSound = false;
+            switch (part.CollisionSoundType)
            {
-                //                soundID = part.CollisionSound;
+                case 0: // default sounds
-                volume = part.CollisionSoundVolume;
+                    volume = 1.0f;
-                if (volume == 0.0f)
+                    break;
-                    return;
+                case 1: // selected sound
-                HaveSound = true;
+                    if(soundID == part.invalidCollisionSoundUUID)
+                        return;
+                    HaveSound = true;
+                    break;
+                case 2: // default sounds with volume set by script
+                default:
+                    break;
            }
+            if (volume == 0.0f)
+                return;
            bool doneownsound = false;
            int thisMaterial = (int)part.Material;
@@ -152,7 +161,7 @@ namespace OpenSim.Region.Framework.Scenes
            CollisionForSoundInfo colInfo;
            uint id;
-            for(int i = 0; i< collidersinfolist.Count; i++)
+            for(int i = 0; i < collidersinfolist.Count; i++)
            {
                colInfo = collidersinfolist[i];
@@ -163,15 +172,16 @@ namespace OpenSim.Region.Framework.Scenes
                        {
                            if (!HaveSound)
                            {
-                                volume = Math.Abs(colInfo.relativeVel);
+                                float vol = Math.Abs(colInfo.relativeVel);
-                                if (volume < 0.2f)
+                                if (vol < 0.2f)
                                    continue;
-                                volume *= volume * .0625f; // 4m/s == full volume
+                                vol *= vol * .0625f; // 4m/s == full volume
-                                if (volume > 1.0f)
+                                if (vol > 1.0f)
-                                    volume = 1.0f;
+                                    vol = 1.0f;
                                soundID = m_TerrainPart[thisMaterial];
+                                volume *= vol;
                            }
                            part.SendCollisionSound(soundID, volume, colInfo.position);
                            doneownsound = true;
@@ -187,7 +197,7 @@ namespace OpenSim.Region.Framework.Scenes
                    if (!HaveSound)
                    {
-                        if (otherPart.CollisionSoundType > 0)
+                        if (otherPart.CollisionSoundType == 1)
                        {
                            soundID = otherPart.CollisionSound;
                            volume = otherPart.CollisionSoundVolume;
@@ -196,19 +206,27 @@ namespace OpenSim.Region.Framework.Scenes
                        }
                        else
                        {
-                            volume = Math.Abs(colInfo.relativeVel);
+                            if (otherPart.CollisionSoundType == 2)
-                            if (volume < 0.2f)
+                            {
+                                volume = otherPart.CollisionSoundVolume;
+                                if (volume == 0.0f)
+                                    continue;
+                            }
+                            float vol = Math.Abs(colInfo.relativeVel);
+                            if (vol < 0.2f)
                                continue;
-                            volume *= volume * .0625f; // 4m/s == full volume
+                            vol *= vol * .0625f; // 4m/s == full volume
-                            if (volume > 1.0f)
+                            if (vol > 1.0f)
-                                volume = 1.0f;
+                                vol = 1.0f;
                            int otherMaterial = (int)otherPart.Material;
                            if (otherMaterial >= MaxMaterials)
                                otherMaterial = 3;
                            soundID = m_PartPart[thisMatScaled + otherMaterial];
+                            volume *= vol;
                        }
                    }
@@ -261,10 +279,17 @@ namespace OpenSim.Region.Framework.Scenes
                {
                    if (otherPart.CollisionSoundType < 0)
                        continue;
-                    if (otherPart.CollisionSoundType > 0 && otherPart.CollisionSoundVolume > 0f)
+                    if (otherPart.CollisionSoundType == 1 && otherPart.CollisionSoundVolume > 0f)
                        otherPart.SendCollisionSound(otherPart.CollisionSound, otherPart.CollisionSoundVolume, colInfo.position);
                    else
                    {
+                        float volmod = 1.0f;
+                        if (otherPart.CollisionSoundType == 2)
+                        {
+                            volmod = otherPart.CollisionSoundVolume;
+                            if(volmod == 0.0)
+                                continue;
+                        }
                        volume = Math.Abs(colInfo.relativeVel);
                        // Most noral collisions (running into walls, stairs)
                        // should never be heard.
@@ -281,6 +306,7 @@ namespace OpenSim.Region.Framework.Scenes
                        if (otherMaterial >= MaxMaterials)
                            otherMaterial = 3;
+                        volume *= volmod;
                        soundID = m_PartPart[thisMatScaled + otherMaterial];
                        otherPart.SendCollisionSound(soundID, volume, colInfo.position);
                    }
diff --git a/OpenSim/Region/Framework/Scenes/SOPVehicle.cs b/OpenSim/Region/Framework/Scenes/SOPVehicle.cs
index 2b33cf7..897918a 100644
--- a/OpenSim/Region/Framework/Scenes/SOPVehicle.cs
+++ b/OpenSim/Region/Framework/Scenes/SOPVehicle.cs
@@ -406,6 +406,16 @@ namespace OpenSim.Region.Framework.Scenes
            ph.SetVehicle(vd);
        }
+        public bool CameraDecoupled
+        {
+            get
+            {
+                if((vd.m_flags & VehicleFlag.CAMERA_DECOUPLED) != 0)
+                    return true;
+                return false;
+            }
+        }
        private XmlTextWriter writer;
        private void XWint(string name, int i)
diff --git a/OpenSim/Region/Framework/Scenes/Scene.PacketHandlers.cs b/OpenSim/Region/Framework/Scenes/Scene.PacketHandlers.cs
index c49edd1..4d491d1 100644
--- a/OpenSim/Region/Framework/Scenes/Scene.PacketHandlers.cs
+++ b/OpenSim/Region/Framework/Scenes/Scene.PacketHandlers.cs
@@ -164,55 +164,39 @@ namespace OpenSim.Region.Framework.Scenes
        /// </summary>
        /// <param name="primLocalID"></param>
        /// <param name="remoteClient"></param>
-        public void SelectPrim(uint primLocalID, IClientAPI remoteClient)
+        public void SelectPrim(List<uint> primIDs, IClientAPI remoteClient)
        {
-            /*
+            List<ISceneEntity> needUpdates = new List<ISceneEntity>();
-                        SceneObjectPart part = GetSceneObjectPart(primLocalID);
-                        if (null == part)
+            foreach(uint primLocalID in primIDs)
-                            return;
+            {
+                SceneObjectPart part = GetSceneObjectPart(primLocalID);
-                        if (part.IsRoot)
-                        {
-                            SceneObjectGroup sog = part.ParentGroup;
-                            sog.SendPropertiesToClient(remoteClient);
-                            // A prim is only tainted if it's allowed to be edited by the person clicking it.
-                            if (Permissions.CanEditObject(sog.UUID, remoteClient.AgentId)
-                                || Permissions.CanMoveObject(sog.UUID, remoteClient.AgentId))
-                            {
-                                sog.IsSelected = true;
-                                EventManager.TriggerParcelPrimCountTainted();
-                            }
-                        }
-                        else
-                        {
-                             part.SendPropertiesToClient(remoteClient);
-                        }
-             */
-            SceneObjectPart part = GetSceneObjectPart(primLocalID);
-            if (null == part)
+                if (part == null)
-                return;
+                    continue;
-            SceneObjectGroup sog = part.ParentGroup;
+                SceneObjectGroup sog = part.ParentGroup;
-            if (sog == null)
+                if (sog == null)
-                return;
+                    continue;
-            part.SendPropertiesToClient(remoteClient);
+                needUpdates.Add((ISceneEntity)part);
-            // waste of time because properties do not send prim flags as they should
+                // waste of time because properties do not send prim flags as they should
-            // if a friend got or lost edit rights after login, a full update is needed
+                // if a friend got or lost edit rights after login, a full update is needed
-            if(sog.OwnerID != remoteClient.AgentId)
+                if(sog.OwnerID != remoteClient.AgentId)
-                part.SendFullUpdate(remoteClient);
+                    part.SendFullUpdate(remoteClient);
-            // A prim is only tainted if it's allowed to be edited by the person clicking it.
+                // A prim is only tainted if it's allowed to be edited by the person clicking it.
-            if (Permissions.CanEditObject(sog.UUID, remoteClient.AgentId)
+                if (Permissions.CanEditObject(sog.UUID, remoteClient.AgentId)
-                || Permissions.CanMoveObject(sog.UUID, remoteClient.AgentId))
+                    || Permissions.CanMoveObject(sog.UUID, remoteClient.AgentId))
-            {
+                {
-                part.IsSelected = true;
+                    part.IsSelected = true;
-                EventManager.TriggerParcelPrimCountTainted();
+                    EventManager.TriggerParcelPrimCountTainted();
+                }
            }
+            if(needUpdates.Count > 0)
+                remoteClient.SendSelectedPartsProprieties(needUpdates);
        }
        /// <summary>
@@ -377,8 +361,21 @@ namespace OpenSim.Region.Framework.Scenes
            if (part == null)
                return;
-            SceneObjectGroup obj = part.ParentGroup;
+            SceneObjectGroup group = part.ParentGroup;
+            if(group == null || group.IsDeleted)
+                return;
+            if (Permissions.CanMoveObject(group.UUID, remoteClient.AgentId))// && PermissionsMngr.)
+            {
+                group.GrabMovement(objectID, offset, pos, remoteClient);
+            }
+            // This is outside the above permissions condition
+            // so that if the object is locked the client moving the object
+            // get's it's position on the simulator even if it was the same as before
+            // This keeps the moving user's client in sync with the rest of the world.
+            group.SendGroupTerseUpdate();
+ 
            SurfaceTouchEventArgs surfaceArg = null;
            if (surfaceArgs != null && surfaceArgs.Count > 0)
                surfaceArg = surfaceArgs[0];
@@ -391,9 +388,9 @@ namespace OpenSim.Region.Framework.Scenes
            // or if we're meant to pass on touches anyway. Don't send to root prim
            // if prim touched is the root prim as we just did it
            if (((part.ScriptEvents & scriptEvents.touch) == 0) ||
-                (part.PassTouches && (part.LocalId != obj.RootPart.LocalId)))
+                (part.PassTouches && (part.LocalId != group.RootPart.LocalId)))
            {
-                EventManager.TriggerObjectGrabbing(obj.RootPart.LocalId, part.LocalId, part.OffsetPosition, remoteClient, surfaceArg);
+                EventManager.TriggerObjectGrabbing(group.RootPart.LocalId, part.LocalId, part.OffsetPosition, remoteClient, surfaceArg);
            }
        }
diff --git a/OpenSim/Region/Framework/Scenes/Scene.cs b/OpenSim/Region/Framework/Scenes/Scene.cs
index d5dbcaf..0d6af77 100755
--- a/OpenSim/Region/Framework/Scenes/Scene.cs
+++ b/OpenSim/Region/Framework/Scenes/Scene.cs
@@ -2780,13 +2780,6 @@ namespace OpenSim.Region.Framework.Scenes
            else
                group.StopScriptInstances();
-            List<ScenePresence> avatars = group.GetSittingAvatars();
-            foreach (ScenePresence av in avatars)
-            {
-                if(av.ParentUUID == UUID.Zero)
-                    av.StandUp();
-            }
            SceneObjectPart[] partList = group.Parts;
            foreach (SceneObjectPart part in partList)
@@ -3336,7 +3329,6 @@ namespace OpenSim.Region.Framework.Scenes
            client.OnObjectRequest += RequestPrim;
            client.OnObjectSelect += SelectPrim;
            client.OnObjectDeselect += DeselectPrim;
-            client.OnGrabUpdate += m_sceneGraph.MoveObject;
            client.OnSpinStart += m_sceneGraph.SpinStart;
            client.OnSpinUpdate += m_sceneGraph.SpinObject;
            client.OnDeRezObject += DeRezObjects;
@@ -3464,7 +3456,6 @@ namespace OpenSim.Region.Framework.Scenes
            client.OnObjectRequest -= RequestPrim;
            client.OnObjectSelect -= SelectPrim;
            client.OnObjectDeselect -= DeselectPrim;
-            client.OnGrabUpdate -= m_sceneGraph.MoveObject;
            client.OnSpinStart -= m_sceneGraph.SpinStart;
            client.OnSpinUpdate -= m_sceneGraph.SpinObject;
            client.OnDeRezObject -= DeRezObjects;
@@ -3479,6 +3470,7 @@ namespace OpenSim.Region.Framework.Scenes
            client.OnRequestObjectPropertiesFamily -= m_sceneGraph.RequestObjectPropertiesFamily;
            client.OnObjectPermissions -= HandleObjectPermissionsUpdate;
            client.OnGrabObject -= ProcessObjectGrab;
+            client.OnGrabUpdate -= ProcessObjectGrabUpdate;
            client.OnDeGrabObject -= ProcessObjectDeGrab;
            client.OnUndo -= m_sceneGraph.HandleUndo;
            client.OnRedo -= m_sceneGraph.HandleRedo;
@@ -5036,7 +5028,7 @@ Label_GroupsDone:
        public LandData GetLandData(uint x, uint y)
        {
-            m_log.DebugFormat("[SCENE]: returning land for {0},{1}", x, y);
+//            m_log.DebugFormat("[SCENE]: returning land for {0},{1}", x, y);
            ILandObject parcel = LandChannel.GetLandObject((int)x, (int)y);
            if (parcel == null)
                return null;
@@ -5439,7 +5431,6 @@ Label_GroupsDone:
                    }
                }
            }
        }
        public void DeleteFromStorage(UUID uuid)
diff --git a/OpenSim/Region/Framework/Scenes/SceneGraph.cs b/OpenSim/Region/Framework/Scenes/SceneGraph.cs
index b65d168..0e5720f 100755
--- a/OpenSim/Region/Framework/Scenes/SceneGraph.cs
+++ b/OpenSim/Region/Framework/Scenes/SceneGraph.cs
@@ -1674,7 +1674,7 @@ namespace OpenSim.Region.Framework.Scenes
                }
            }
        }
+/* moved to scene ProcessObjectGrabUpdate
        /// <summary>
        /// Move the given object
        /// </summary>
@@ -1699,7 +1699,7 @@ namespace OpenSim.Region.Framework.Scenes
                group.SendGroupTerseUpdate();
            }
        }
+*/
        /// <summary>
        /// Start spinning the given object
        /// </summary>
diff --git a/OpenSim/Region/Framework/Scenes/SceneObjectGroup.cs b/OpenSim/Region/Framework/Scenes/SceneObjectGroup.cs
index df6a1cf..b7c5b6b 100644
--- a/OpenSim/Region/Framework/Scenes/SceneObjectGroup.cs
+++ b/OpenSim/Region/Framework/Scenes/SceneObjectGroup.cs
@@ -2078,7 +2078,7 @@ namespace OpenSim.Region.Framework.Scenes
                Scene.ForEachScenePresence(delegate(ScenePresence avatar)
                {
-                    if (!avatar.IsChildAgent && avatar.ParentID == LocalId)
+                    if (!avatar.IsChildAgent && avatar.ParentID == part.LocalId && avatar.ParentUUID == UUID.Zero)
                        avatar.StandUp();
                    if (!silent)
@@ -2092,6 +2092,8 @@ namespace OpenSim.Region.Framework.Scenes
                            {
                                // Send a kill object immediately
                                avatar.ControllingClient.SendKillObject(new List<uint> { part.LocalId });
+                                //direct enqueue another delayed kill
+                                avatar.ControllingClient.SendEntityUpdate(part,PrimUpdateFlags.Kill);
                            }
                        }
                    }
@@ -2110,6 +2112,12 @@ namespace OpenSim.Region.Framework.Scenes
            d.AddActiveScripts(count);
        }
+        private const scriptEvents PhysicsNeeedSubsEvents = (
+            scriptEvents.collision | scriptEvents.collision_start | scriptEvents.collision_end |
+            scriptEvents.land_collision | scriptEvents.land_collision_start | scriptEvents.land_collision_end);
+        private scriptEvents lastRootPartPhysEvents = 0;
        public void aggregateScriptEvents()
        {
            PrimFlags objectflagupdate = (PrimFlags)RootPart.GetEffectiveObjectFlags();
@@ -2146,6 +2154,20 @@ namespace OpenSim.Region.Framework.Scenes
                m_scene.RemoveGroupTarget(this);
            }
+            scriptEvents rootPartPhysEvents = RootPart.AggregateScriptEvents;
+            rootPartPhysEvents &= PhysicsNeeedSubsEvents;
+            if (rootPartPhysEvents != lastRootPartPhysEvents)
+            {
+                lastRootPartPhysEvents = rootPartPhysEvents;
+                for (int i = 0; i < parts.Length; i++)
+                {
+                    SceneObjectPart part = parts[i];
+                    if (part == null)
+                        continue;
+                    part.UpdatePhysicsSubscribedEvents();
+                }
+            }
            ScheduleGroupForFullUpdate();
        }
@@ -2174,7 +2196,6 @@ namespace OpenSim.Region.Framework.Scenes
                // Apply physics to the root prim
                m_rootPart.ApplyPhysics(m_rootPart.GetEffectiveObjectFlags(), m_rootPart.VolumeDetectActive, true);
                for (int i = 0; i < parts.Length; i++)
                {
                    SceneObjectPart part = parts[i];
@@ -2242,10 +2263,10 @@ namespace OpenSim.Region.Framework.Scenes
            // any exception propogate upwards.
            try
            {
-                if (!m_scene.ShuttingDown || // if shutting down then there will be nothing to handle the return so leave till next restart
+                 // if shutting down then there will be nothing to handle the return so leave till next restart
-                        !m_scene.LoginsEnabled || // We're starting up or doing maintenance, don't mess with things
+                if (!m_scene.ShuttingDown &&
-                        m_scene.LoadingPrims) // Land may not be valid yet
+                        m_scene.LoginsEnabled && // We're starting up or doing maintenance, don't mess with things
-                
+                        !m_scene.LoadingPrims) // Land may not be valid yet
                {
                    ILandObject parcel = m_scene.LandChannel.GetLandObject(
                            m_rootPart.GroupPosition.X, m_rootPart.GroupPosition.Y);
@@ -3345,7 +3366,10 @@ namespace OpenSim.Region.Framework.Scenes
            //    engine about the delink. Someday, linksets should be made first
            //    class objects in the physics engine interface).
            if (linkPartPa != null)
+            {
                m_scene.PhysicsScene.RemovePrim(linkPartPa);
+                linkPart.PhysActor = null;
+            }
            // We need to reset the child part's position
            // ready for life as a separate object after being a part of another object
@@ -3397,10 +3421,11 @@ namespace OpenSim.Region.Framework.Scenes
        public virtual void DetachFromBackup()
        {
            if (m_scene != null)
+            {
                m_scene.SceneGraph.FireDetachFromBackup(this);
-            if (Backup && Scene != null)
+                if (Backup)
-                m_scene.EventManager.OnBackup -= ProcessBackup;
+                    m_scene.EventManager.OnBackup -= ProcessBackup;
-            
+            }
            Backup = false;
        }
diff --git a/OpenSim/Region/Framework/Scenes/SceneObjectPart.cs b/OpenSim/Region/Framework/Scenes/SceneObjectPart.cs
index 01a323e..fcc3463 100644
--- a/OpenSim/Region/Framework/Scenes/SceneObjectPart.cs
+++ b/OpenSim/Region/Framework/Scenes/SceneObjectPart.cs
@@ -345,6 +345,7 @@ namespace OpenSim.Region.Framework.Scenes
        private string m_text = String.Empty;
        private string m_touchName = String.Empty;
        private UndoRedoState m_UndoRedo = null;
+        private object m_UndoLock = new object();
        private bool m_passTouches = false;
        private bool m_passCollisions = false;
@@ -399,13 +400,12 @@ namespace OpenSim.Region.Framework.Scenes
        // 0 for default collision sounds, -1 for script disabled sound 1 for script defined sound
-        private sbyte m_collisionSoundType;
+        private sbyte m_collisionSoundType = 0;
        private UUID m_collisionSound;
        private float m_collisionSoundVolume;
        private int LastColSoundSentTime; 
        private SOPVehicle m_vehicleParams = null;
        public KeyframeMotion KeyframeMotion
@@ -1534,7 +1534,6 @@ namespace OpenSim.Region.Framework.Scenes
                else
                    m_collisionSoundType = 1;
-                aggregateScriptEvents();
            }
        }
@@ -2164,7 +2163,10 @@ namespace OpenSim.Region.Framework.Scenes
                    UpdatePhysicsSubscribedEvents(); // not sure if appliable here
                }
                else
+                {
                    PhysActor = null; // just to be sure
+                    RemFlag(PrimFlags.CameraDecoupled);
+                }
            }
        }
@@ -3539,6 +3541,7 @@ SendFullUpdateToClient(remoteClient, Position) ignores position parameter
            set
            {
                m_vehicleParams = value;
            }
        }
@@ -3583,7 +3586,7 @@ SendFullUpdateToClient(remoteClient, Position) ignores position parameter
            m_vehicleParams.ProcessVehicleFlags(param, remove);
-            if (_parentID ==0 && PhysActor != null)
+            if (_parentID == 0 && PhysActor != null)
            {
                PhysActor.VehicleFlags(param, remove);
            }
@@ -3932,11 +3935,11 @@ SendFullUpdateToClient(remoteClient, Position) ignores position parameter
        public void StoreUndoState(ObjectChangeType change)
        {
-            if (m_UndoRedo == null)
+            lock (m_UndoLock)
-                m_UndoRedo = new UndoRedoState(5);
-            lock (m_UndoRedo)
            {
+                if (m_UndoRedo == null)
+                    m_UndoRedo = new UndoRedoState(5);
                if (!Undoing && !IgnoreUndoUpdate && ParentGroup != null) // just to read better  - undo is in progress, or suspended
                {
                    m_UndoRedo.StoreUndo(this, change);
@@ -3959,11 +3962,11 @@ SendFullUpdateToClient(remoteClient, Position) ignores position parameter
        public void Undo()
        {
-            if (m_UndoRedo == null || Undoing || ParentGroup == null)
+            lock (m_UndoLock)
-                return;
-            lock (m_UndoRedo)
            {
+                if (m_UndoRedo == null || Undoing || ParentGroup == null)
+                    return;
                Undoing = true;
                m_UndoRedo.Undo(this);
                Undoing = false;
@@ -3972,11 +3975,11 @@ SendFullUpdateToClient(remoteClient, Position) ignores position parameter
        public void Redo()
        {
-            if (m_UndoRedo == null || Undoing || ParentGroup == null)
+            lock (m_UndoLock)
-                return;
-            lock (m_UndoRedo)
            {
+                if (m_UndoRedo == null || Undoing || ParentGroup == null)
+                    return;
                Undoing = true;
                m_UndoRedo.Redo(this);
                Undoing = false;
@@ -3985,11 +3988,11 @@ SendFullUpdateToClient(remoteClient, Position) ignores position parameter
        public void ClearUndoState()
        {
-            if (m_UndoRedo == null || Undoing)
+            lock (m_UndoLock)
-                return;
-            lock (m_UndoRedo)
            {
+                if (m_UndoRedo == null || Undoing)
+                    return;
                m_UndoRedo.Clear();
            }
        }
@@ -4722,9 +4725,16 @@ SendFullUpdateToClient(remoteClient, Position) ignores position parameter
                if (VolumeDetectActive) // change if not the default only
                    pa.SetVolumeDetect(1);
-                if (m_vehicleParams != null && LocalId == ParentGroup.RootPart.LocalId)
+                if (m_vehicleParams != null && m_localId == ParentGroup.RootPart.LocalId)
+                {
                    m_vehicleParams.SetVehicle(pa);
+                    if(isPhysical && !isPhantom && m_vehicleParams.CameraDecoupled)
+                        AddFlag(PrimFlags.CameraDecoupled);
+                    else
+                        RemFlag(PrimFlags.CameraDecoupled);
+                }                
+                else
+                    RemFlag(PrimFlags.CameraDecoupled);
                // we are going to tell rest of code about physics so better have this here
                PhysActor = pa;
@@ -4800,6 +4810,7 @@ SendFullUpdateToClient(remoteClient, Position) ignores position parameter
                ParentGroup.Scene.EventManager.TriggerObjectRemovedFromPhysicalScene(this);
            }
+            RemFlag(PrimFlags.CameraDecoupled);
            PhysActor = null;
        }
@@ -5021,7 +5032,7 @@ SendFullUpdateToClient(remoteClient, Position) ignores position parameter
        }
-        private void UpdatePhysicsSubscribedEvents()
+        internal void UpdatePhysicsSubscribedEvents()
        {
            PhysicsActor pa = PhysActor;
            if (pa == null)
@@ -5095,8 +5106,6 @@ SendFullUpdateToClient(remoteClient, Position) ignores position parameter
                objectflagupdate |= (uint) PrimFlags.AllowInventoryDrop;
            }
-            UpdatePhysicsSubscribedEvents();
            LocalFlags = (PrimFlags)objectflagupdate;
            if (ParentGroup != null && ParentGroup.RootPart == this)
@@ -5107,6 +5116,7 @@ SendFullUpdateToClient(remoteClient, Position) ignores position parameter
            {
 //                m_log.DebugFormat(
 //                    "[SCENE OBJECT PART]: Scheduling part {0} {1} for full update in aggregateScriptEvents()", Name, LocalId);
+                UpdatePhysicsSubscribedEvents();
                ScheduleFullUpdate();
            }
        }
@@ -5408,5 +5418,24 @@ SendFullUpdateToClient(remoteClient, Position) ignores position parameter
            Acceleration = Vector3.Zero;
            APIDActive = false;
        }
+        // handle osVolumeDetect
+        public void ScriptSetVolumeDetect(bool makeVolumeDetect)
+        {
+            if(_parentID == 0)
+            {
+                // if root prim do it via SOG
+                ParentGroup.ScriptSetVolumeDetect(makeVolumeDetect);
+                return;
+            }
+            bool wasUsingPhysics = ((Flags & PrimFlags.Physics) != 0);
+            bool wasTemporary = ((Flags & PrimFlags.TemporaryOnRez) != 0);
+            bool wasPhantom = ((Flags & PrimFlags.Phantom) != 0);
+            if(PhysActor != null)
+                PhysActor.Building = true;
+            UpdatePrimFlags(wasUsingPhysics,wasTemporary,wasPhantom,makeVolumeDetect,false);
+        }
    }
 }
diff --git a/OpenSim/Region/Framework/Scenes/ScenePresence.cs b/OpenSim/Region/Framework/Scenes/ScenePresence.cs
index 732d5ef..cb7422b 100644
--- a/OpenSim/Region/Framework/Scenes/ScenePresence.cs
+++ b/OpenSim/Region/Framework/Scenes/ScenePresence.cs
@@ -542,10 +542,7 @@ namespace OpenSim.Region.Framework.Scenes
        public Vector3 CameraPosition { get; set; }
-        public Quaternion CameraRotation
+        public Quaternion CameraRotation { get; private set; }
-        {
-            get { return Util.Axes2Rot(CameraAtAxis, CameraLeftAxis, CameraUpAxis); }
-        }
        // Use these three vectors to figure out what the agent is looking at
        // Convert it to a Matrix and/or Quaternion
@@ -1242,6 +1239,14 @@ namespace OpenSim.Region.Framework.Scenes
                        ParentPart = part;
                        m_pos = PrevSitOffset;
                        pos = part.GetWorldPosition();
+                        PhysicsActor partPhysActor = part.PhysActor;
+                        if(partPhysActor != null)
+                        {
+                            partPhysActor.OnPhysicsRequestingCameraData -=
+                                        physActor_OnPhysicsRequestingCameraData;
+                            partPhysActor.OnPhysicsRequestingCameraData +=
+                                        physActor_OnPhysicsRequestingCameraData;
+                        }
                    }
                    ParentUUID = UUID.Zero;
                }
@@ -1922,6 +1927,31 @@ namespace OpenSim.Region.Framework.Scenes
            return true;
        }
+        public void RotateToLookAt(Vector3 lookAt)
+        {
+            if(ParentID == 0)
+            {
+                float n = lookAt.X * lookAt.X + lookAt.Y * lookAt.Y;
+                if(n < 0.0001f)
+                {
+                    Rotation = Quaternion.Identity;
+                    return;
+                }
+                n = lookAt.X/(float)Math.Sqrt(n);
+                float angle = (float)Math.Acos(n);
+                angle *= 0.5f;
+                float s = (float)Math.Sin(angle);
+                if(lookAt.Y < 0)
+                    s = -s;
+                Rotation = new Quaternion(
+                    0f,
+                    0f,
+                    s,
+                    (float)Math.Cos(angle)
+                    );
+            }
+        }
        /// <summary>
        /// Complete Avatar's movement into the region.
        /// </summary>
@@ -1958,10 +1988,10 @@ namespace OpenSim.Region.Framework.Scenes
                bool flying = ((m_AgentControlFlags & AgentManager.ControlFlags.AGENT_CONTROL_FLY) != 0);
                Vector3 look = Lookat;
+                look.Z = 0f;
                if ((Math.Abs(look.X) < 0.01) && (Math.Abs(look.Y) < 0.01))
                {
                    look = Velocity;
-                    look.Z = 0;
                    look.Normalize();
                    if ((Math.Abs(look.X) < 0.01) && (Math.Abs(look.Y) < 0.01) )
                        look = new Vector3(0.99f, 0.042f, 0);
@@ -1995,11 +2025,12 @@ namespace OpenSim.Region.Framework.Scenes
                    m_log.DebugFormat("[CompleteMovement]: Missing COF for {0} is {1}", client.AgentId, COF);
                }
+                if(!gotCrossUpdate)
+                    RotateToLookAt(look);
                // Tell the client that we're totally ready
                ControllingClient.MoveAgentIntoRegion(m_scene.RegionInfo, AbsolutePosition, look);
                m_log.DebugFormat("[CompleteMovement] MoveAgentIntoRegion: {0}ms", Util.EnvironmentTickCountSubtract(ts));
                if (!string.IsNullOrEmpty(m_callbackURI))
@@ -2696,9 +2727,13 @@ namespace OpenSim.Region.Framework.Scenes
            CameraPosition = agentData.CameraCenter;
            // Use these three vectors to figure out what the agent is looking at
            // Convert it to a Matrix and/or Quaternion
+            // this my need lock
            CameraAtAxis = agentData.CameraAtAxis;
            CameraLeftAxis = agentData.CameraLeftAxis;
            CameraUpAxis = agentData.CameraUpAxis;
+            Quaternion camRot = Util.Axes2Rot(CameraAtAxis, CameraLeftAxis, CameraUpAxis);
+            CameraRotation = camRot;
            // The Agent's Draw distance setting
            // When we get to the point of re-computing neighbors everytime this
@@ -3171,9 +3206,9 @@ namespace OpenSim.Region.Framework.Scenes
                    offset = offset * part.RotationOffset;
                    offset += part.OffsetPosition;
-                    if (CameraAtAxis == Vector3.Zero && cameraEyeOffset == Vector3.Zero)
+                    if (cameraAtOffset == Vector3.Zero && cameraEyeOffset == Vector3.Zero)
                    {
-                        CameraAtAxis = part.ParentGroup.RootPart.GetCameraAtOffset();
+                        cameraAtOffset = part.ParentGroup.RootPart.GetCameraAtOffset();
                        cameraEyeOffset = part.ParentGroup.RootPart.GetCameraEyeOffset();
                    }
                    else
@@ -3304,7 +3339,6 @@ namespace OpenSim.Region.Framework.Scenes
            Vector3 cameraEyeOffset = part.GetCameraEyeOffset();
            bool forceMouselook = part.GetForceMouselook();
-            m_bodyRot = Orientation;
            if (!part.IsRoot)
            {
@@ -3312,9 +3346,9 @@ namespace OpenSim.Region.Framework.Scenes
                offset = offset * part.RotationOffset;
                offset += part.OffsetPosition;
-                if (CameraAtAxis == Vector3.Zero && cameraEyeOffset == Vector3.Zero)
+                if (cameraAtOffset == Vector3.Zero && cameraEyeOffset == Vector3.Zero)
                {
-                    CameraAtAxis = part.ParentGroup.RootPart.GetCameraAtOffset();
+                    cameraAtOffset = part.ParentGroup.RootPart.GetCameraAtOffset();
                    cameraEyeOffset = part.ParentGroup.RootPart.GetCameraEyeOffset();
                }
                else
@@ -3326,6 +3360,7 @@ namespace OpenSim.Region.Framework.Scenes
                }
            }
+            m_bodyRot = Orientation;
            m_pos = offset;
            ControllingClient.SendSitResponse(
@@ -4571,6 +4606,11 @@ namespace OpenSim.Region.Framework.Scenes
            CameraAtAxis = cAgent.AtAxis;
            CameraLeftAxis = cAgent.LeftAxis;
            CameraUpAxis = cAgent.UpAxis;
+            Quaternion camRot = Util.Axes2Rot(CameraAtAxis, CameraLeftAxis, CameraUpAxis);
+            CameraRotation = camRot;
            ParentUUID = cAgent.ParentPart;
            PrevSitOffset = cAgent.SitOffset;
@@ -5429,10 +5469,21 @@ namespace OpenSim.Region.Framework.Scenes
            }
        }
+        CameraData physActor_OnPhysicsRequestingCameraData()
+        {
+            return new CameraData
+            {
+                Valid = true,
+                MouseLook = this.m_mouseLook,
+                CameraRotation = this.CameraRotation,
+                CameraAtAxis = this.CameraAtAxis
+            };
+        }
        public void RegisterControlEventsToScript(int controls, int accept, int pass_on, uint Obj_localID, UUID Script_item_UUID)
        {
-            SceneObjectPart p = m_scene.GetSceneObjectPart(Obj_localID);
+            SceneObjectPart part = m_scene.GetSceneObjectPart(Obj_localID);
-            if (p == null)
+            if (part == null)
                return;
            ControllingClient.SendTakeControls(controls, false, false);
@@ -5442,7 +5493,7 @@ namespace OpenSim.Region.Framework.Scenes
            obj.ignoreControls = ScriptControlled.CONTROL_ZERO;
            obj.eventControls = ScriptControlled.CONTROL_ZERO;
-            obj.objectID = p.ParentGroup.UUID;
+            obj.objectID = part.ParentGroup.UUID;
            obj.itemID = Script_item_UUID;
            if (pass_on == 0 && accept == 0)
            {
@@ -5470,17 +5521,43 @@ namespace OpenSim.Region.Framework.Scenes
                {
                    IgnoredControls &= ~(ScriptControlled)controls;
                    if (scriptedcontrols.ContainsKey(Script_item_UUID))
-                        scriptedcontrols.Remove(Script_item_UUID);
+                        RemoveScriptFromControlNotifications(Script_item_UUID, part);
                }
                else
                {
-                    scriptedcontrols[Script_item_UUID] = obj;
+                    AddScriptToControlNotifications(Script_item_UUID, part, ref obj);
                }
            }
            ControllingClient.SendTakeControls(controls, pass_on == 1 ? true : false, true);
        }
+        private void AddScriptToControlNotifications(OpenMetaverse.UUID Script_item_UUID, SceneObjectPart part, ref ScriptControllers obj)
+        {
+            scriptedcontrols[Script_item_UUID] = obj;
+            PhysicsActor physActor = part.ParentGroup.RootPart.PhysActor;
+            if (physActor != null)
+            {
+                physActor.OnPhysicsRequestingCameraData -= physActor_OnPhysicsRequestingCameraData;
+                physActor.OnPhysicsRequestingCameraData += physActor_OnPhysicsRequestingCameraData;
+            }
+        }
+        private void RemoveScriptFromControlNotifications(OpenMetaverse.UUID Script_item_UUID, SceneObjectPart part)
+        {
+            scriptedcontrols.Remove(Script_item_UUID);
+            if (part != null)
+            {
+                PhysicsActor physActor = part.ParentGroup.RootPart.PhysActor;
+                if (physActor != null)
+                {
+                    physActor.OnPhysicsRequestingCameraData -= physActor_OnPhysicsRequestingCameraData;
+                }
+            }
+        }
        public void HandleForceReleaseControls(IClientAPI remoteClient, UUID agentID)
        {
            IgnoredControls = ScriptControlled.CONTROL_ZERO;
@@ -5518,6 +5595,7 @@ namespace OpenSim.Region.Framework.Scenes
        public void UnRegisterControlEventsToScript(uint Obj_localID, UUID Script_item_UUID)
        {
            ScriptControllers takecontrols;
+            SceneObjectPart part = m_scene.GetSceneObjectPart(Obj_localID);
            lock (scriptedcontrols)
            {
@@ -5528,7 +5606,7 @@ namespace OpenSim.Region.Framework.Scenes
                    ControllingClient.SendTakeControls((int)sctc, false, false);
                    ControllingClient.SendTakeControls((int)sctc, true, false);
-                    scriptedcontrols.Remove(Script_item_UUID);
+                    RemoveScriptFromControlNotifications(Script_item_UUID, part);
                    IgnoredControls = ScriptControlled.CONTROL_ZERO;
                    foreach (ScriptControllers scData in scriptedcontrols.Values)
                    {
@@ -5947,6 +6025,7 @@ namespace OpenSim.Region.Framework.Scenes
                         (m_teleportFlags & Constants.TeleportFlags.ViaHGLogin) != 0))
                    {
                        pos = land.LandData.UserLocation;
+                        positionChanged = true;
                    }
                }
diff --git a/OpenSim/Region/OptionalModules/Agent/InternetRelayClientView/Server/IRCClientView.cs b/OpenSim/Region/OptionalModules/Agent/InternetRelayClientView/Server/IRCClientView.cs
index e21d69f..427b48e 100644
--- a/OpenSim/Region/OptionalModules/Agent/InternetRelayClientView/Server/IRCClientView.cs
+++ b/OpenSim/Region/OptionalModules/Agent/InternetRelayClientView/Server/IRCClientView.cs
@@ -1753,6 +1753,10 @@ namespace OpenSim.Region.OptionalModules.Agent.InternetRelayClientView.Server
        {
        }
+        public void SendSelectedPartsProprieties(List<ISceneEntity> parts)
+        {
+        }
        public void SendPartPhysicsProprieties(ISceneEntity entity)
        {
        }
diff --git a/OpenSim/Region/OptionalModules/Avatar/Chat/IRCConnector.cs b/OpenSim/Region/OptionalModules/Avatar/Chat/IRCConnector.cs
index 5b9a5b5..941379f 100644
--- a/OpenSim/Region/OptionalModules/Avatar/Chat/IRCConnector.cs
+++ b/OpenSim/Region/OptionalModules/Avatar/Chat/IRCConnector.cs
@@ -270,7 +270,6 @@ namespace OpenSim.Region.OptionalModules.Avatar.Chat
        public void Close()
        {
            m_log.InfoFormat("[IRC-Connector-{0}] Closing", idn);
            lock (msyncConnect)
@@ -295,7 +294,6 @@ namespace OpenSim.Region.OptionalModules.Avatar.Chat
                        }
                        catch (Exception) { }
                        m_connected = false;
                        try { m_writer.Close(); }
@@ -308,10 +306,8 @@ namespace OpenSim.Region.OptionalModules.Avatar.Chat
                        catch (Exception) { }
                    }
                    lock (m_connectors)
                        m_connectors.Remove(this);
                }
            }
@@ -327,25 +323,21 @@ namespace OpenSim.Region.OptionalModules.Avatar.Chat
        public void Connect()
        {
            if (!m_enabled)
                return;
            // Delay until next WD cycle if this is too close to the last start attempt
+            if(_icc_ < ICCD_PERIOD)
-            while (_icc_ < ICCD_PERIOD)
                return;
            m_log.DebugFormat("[IRC-Connector-{0}]: Connection request for {1} on {2}:{3}", idn, m_nick, m_server, m_ircChannel);
+            _icc_ = 0;
            lock (msyncConnect)
            {
-                _icc_ = 0;
                try
                {
                    if (m_connected) return;
                    m_connected = true;
@@ -379,11 +371,9 @@ namespace OpenSim.Region.OptionalModules.Avatar.Chat
                    // expires. By leaving them as they are, the connection will be retried
                    // when the login timeout expires. Which is preferred.
                }
            }
            return;
        }
        // Reconnect is used to force a re-cycle of the IRC connection. Should generally
diff --git a/OpenSim/Region/OptionalModules/Avatar/XmlRpcGroups/GroupsModule.cs b/OpenSim/Region/OptionalModules/Avatar/XmlRpcGroups/GroupsModule.cs
index 626937c..81add13 100644
--- a/OpenSim/Region/OptionalModules/Avatar/XmlRpcGroups/GroupsModule.cs
+++ b/OpenSim/Region/OptionalModules/Avatar/XmlRpcGroups/GroupsModule.cs
@@ -1177,18 +1177,16 @@ namespace OpenSim.Region.OptionalModules.Avatar.XmlRpcGroups
            }
            GroupRecord groupInfo = m_groupData.GetGroupRecord(agentID, groupID, null);
+            if (groupInfo == null)
-            UserAccount account = m_sceneList[0].UserAccountService.GetUserAccount(regionInfo.ScopeID, ejecteeID);
-            if ((groupInfo == null) || (account == null))
-            {
                return;
-            }
            IClientAPI ejecteeClient = GetActiveRootClient(ejecteeID);
            // Send Message to Ejectee
            GridInstantMessage msg = new GridInstantMessage();
            
+            string ejecteeName = "Unknown member";
            // if local send a normal message
            if(ejecteeClient != null)
            {
@@ -1197,6 +1195,7 @@ namespace OpenSim.Region.OptionalModules.Avatar.XmlRpcGroups
                // also execute and send update
                ejecteeClient.SendAgentDropGroup(groupID);
                SendAgentGroupDataUpdate(ejecteeClient,true);
+                ejecteeName = ejecteeClient.Name;
            }
            else // send
            {
@@ -1208,6 +1207,9 @@ namespace OpenSim.Region.OptionalModules.Avatar.XmlRpcGroups
                msg.imSessionID = groupInfo.GroupID.Guid;
                msg.dialog = (byte)210; //interop
+                UserAccount account = m_sceneList[0].UserAccountService.GetUserAccount(regionInfo.ScopeID, ejecteeID);
+                if (account != null)
+                    ejecteeName = account.FirstName + " " + account.LastName;
            }
            msg.fromAgentID = agentID.Guid;
@@ -1234,14 +1236,9 @@ namespace OpenSim.Region.OptionalModules.Avatar.XmlRpcGroups
            msg.toAgentID = agentID.Guid;
            msg.timestamp = 0;
            msg.fromAgentName = agentName;
-            if (account != null)
-            {
+            msg.message = string.Format("{2} has been ejected from '{1}' by {0}.", agentName, groupInfo.GroupName, ejecteeName);
-                msg.message = string.Format("{2} has been ejected from '{1}' by {0}.", agentName, groupInfo.GroupName, account.FirstName + " " + account.LastName);
-            }
-            else
-            {
-                msg.message = string.Format("{2} has been ejected from '{1}' by {0}.", agentName, groupInfo.GroupName, "Unknown member");
-            }
 //            msg.dialog = (byte)210; //interop
            msg.dialog = (byte)OpenMetaverse.InstantMessageDialog.MessageFromAgent;
            msg.fromGroup = false;
diff --git a/OpenSim/Region/OptionalModules/UserStatistics/Clients_report.cs b/OpenSim/Region/OptionalModules/UserStatistics/Clients_report.cs
index 4a6f7be..3f36e32 100644
--- a/OpenSim/Region/OptionalModules/UserStatistics/Clients_report.cs
+++ b/OpenSim/Region/OptionalModules/UserStatistics/Clients_report.cs
@@ -97,9 +97,8 @@ namespace OpenSim.Region.UserStatistics
                    sdr.Read();
                    totalregions = Convert.ToInt32(sdr["regcnt"]);
                }
                sdr.Close();
-                sdr.Dispose();
+                cmd.Dispose();
                sql =
                    "select client_version, count(*) as cnt, avg(avg_sim_fps) as simfps from stats_session_data group by client_version order by count(*) desc LIMIT 10;";
@@ -120,7 +119,7 @@ namespace OpenSim.Region.UserStatistics
                    }
                }
                sdr.Close();
-                sdr.Dispose();
+                cmd.Dispose();
                if (totalregions > 1)
                {
@@ -143,11 +142,8 @@ namespace OpenSim.Region.UserStatistics
                        }
                    }
                    sdr.Close();
-                    sdr.Dispose();
+                    cmd.Dispose();
                }
            }
            
            foreach (ClientVersionData cvd in cliRegData)
@@ -163,9 +159,6 @@ namespace OpenSim.Region.UserStatistics
                {
                    regionTotals.Add(cvd.region_id, cvd.count);
                }
-                
-                
            }
            modeldata["ClientData"] = clidata;
diff --git a/OpenSim/Region/OptionalModules/UserStatistics/Default_Report.cs b/OpenSim/Region/OptionalModules/UserStatistics/Default_Report.cs
index fabe3d4..8745acd 100644
--- a/OpenSim/Region/OptionalModules/UserStatistics/Default_Report.cs
+++ b/OpenSim/Region/OptionalModules/UserStatistics/Default_Report.cs
@@ -227,7 +227,10 @@ TD.align_top { vertical-align: top; }
                    returnstruct.avg_client_mem_use = Convert.ToSingle(sdr["sav_mem_use"]);
                }
+                sdr.Close();
+                cmd.Dispose();
            }
+            
            return returnstruct;
        }
diff --git a/OpenSim/Region/OptionalModules/UserStatistics/Sessions_Report.cs b/OpenSim/Region/OptionalModules/UserStatistics/Sessions_Report.cs
index 0e94912..74e9c66 100644
--- a/OpenSim/Region/OptionalModules/UserStatistics/Sessions_Report.cs
+++ b/OpenSim/Region/OptionalModules/UserStatistics/Sessions_Report.cs
@@ -145,8 +145,7 @@ namespace OpenSim.Region.UserStatistics
                    }
                }
                sdr.Close();
-                sdr.Dispose();
+                cmd.Dispose();               
-                
            }
            modeldata["SessionData"] = lstSessions;
            return modeldata;
diff --git a/OpenSim/Region/OptionalModules/World/NPC/NPCAvatar.cs b/OpenSim/Region/OptionalModules/World/NPC/NPCAvatar.cs
index 52e8660..07413cf 100644
--- a/OpenSim/Region/OptionalModules/World/NPC/NPCAvatar.cs
+++ b/OpenSim/Region/OptionalModules/World/NPC/NPCAvatar.cs
@@ -1337,6 +1337,10 @@ namespace OpenSim.Region.OptionalModules.World.NPC
        {
        }
+        public void SendSelectedPartsProprieties(List<ISceneEntity> parts)
+        {
+        }
        public void SendPartPhysicsProprieties(ISceneEntity entity)
        {
        }
diff --git a/OpenSim/Region/PhysicsModules/BulletS/BSScene.cs b/OpenSim/Region/PhysicsModules/BulletS/BSScene.cs
index 9b677be..ee57f0c 100644
--- a/OpenSim/Region/PhysicsModules/BulletS/BSScene.cs
+++ b/OpenSim/Region/PhysicsModules/BulletS/BSScene.cs
@@ -954,25 +954,6 @@ namespace OpenSim.Region.PhysicsModule.BulletS
            // m_log.DebugFormat("{0}: DeleteTerrain()", LogHeader);
        }
-        // Although no one seems to check this, I do support combining.
-        public override bool SupportsCombining()
-        {
-            return TerrainManager.SupportsCombining();
-        }
-        // This call says I am a child to region zero in a mega-region. 'pScene' is that
-        //    of region zero, 'offset' is my offset from regions zero's origin, and
-        //    'extents' is the largest XY that is handled in my region.
-        public override void Combine(PhysicsScene pScene, Vector3 offset, Vector3 extents)
-        {
-            TerrainManager.Combine(pScene, offset, extents);
-        }
-        // Unhook all the combining that I know about.
-        public override void UnCombine(PhysicsScene pScene)
-        {
-            TerrainManager.UnCombine(pScene);
-        }
        #endregion // Terrain
        public override Dictionary<uint, float> GetTopColliders()
diff --git a/OpenSim/Region/PhysicsModules/ConvexDecompositionDotNet/HullUtils.cs b/OpenSim/Region/PhysicsModules/ConvexDecompositionDotNet/HullUtils.cs
index b0bbfb9..72f2d6d 100644
--- a/OpenSim/Region/PhysicsModules/ConvexDecompositionDotNet/HullUtils.cs
+++ b/OpenSim/Region/PhysicsModules/ConvexDecompositionDotNet/HullUtils.cs
@@ -1074,14 +1074,27 @@ namespace OpenSim.Region.PhysicsModules.ConvexDecompositionDotNet
        public static int maxdirfiltered(List<float3> p, int count, float3 dir, byte[] allow)
        {
            //Debug.Assert(count != 0);
-            int m = 0;
+            int m = -1;
-            float currDotm = float3.dot(p[0], dir);
+            float currDotm = 0;
            float currDoti;
-            while (allow[m] == 0)
+            for (int i = 0; i < count; i++)
-                m++;
+            {
+                if (allow[i] != 0)
+                {
+                    currDotm = float3.dot(p[i], dir);
+                    m = i;
+                    break;
+               }
+            }
-            for (int i = 1; i < count; i++)
+            if(m == -1)
+            {
+                Debug.Assert(false);
+                return m;
+            }
+            for (int i = m + 1; i < count; i++)
            {
                if (allow[i] != 0)
                {
@@ -1093,7 +1106,8 @@ namespace OpenSim.Region.PhysicsModules.ConvexDecompositionDotNet
                    }
                }
            }
-            //Debug.Assert(m != -1);
+//            Debug.Assert(m != -1);
            return m;
        }
@@ -1112,8 +1126,8 @@ namespace OpenSim.Region.PhysicsModules.ConvexDecompositionDotNet
                {
                    int mb;
                    {
-                        float s = (float)Math.Sin((3.14159264f / 180.0f) * (x));
+                        float s = (float)Math.Sin(0.01745329f * x);
-                        float c = (float)Math.Cos((3.14159264f / 180.0f) * (x));
+                        float c = (float)Math.Cos(0.01745329f * x);
                        mb = maxdirfiltered(p, count, dir + (u * s + v * c) * 0.025f, allow);
                    }
                    if (ma == m && mb == m)
@@ -1126,8 +1140,8 @@ namespace OpenSim.Region.PhysicsModules.ConvexDecompositionDotNet
                        int mc = ma;
                        for (float xx = x - 40.0f; xx <= x; xx += 5.0f)
                        {
-                            float s = (float)Math.Sin((3.14159264f / 180.0f) * (xx));
+                            float s = (float)Math.Sin(0.01745329f * xx);
-                            float c = (float)Math.Cos((3.14159264f / 180.0f) * (xx));
+                            float c = (float)Math.Cos(0.01745329f * xx);
                            int md = maxdirfiltered(p, count, dir + (u * s + v * c) * 0.025f, allow);
                            if (mc == m && md == m)
                            {
@@ -1176,7 +1190,7 @@ namespace OpenSim.Region.PhysicsModules.ConvexDecompositionDotNet
            Debug.Assert(!(p0 == p1 || p0 == p2 || p0 == p3 || p1 == p2 || p1 == p3 || p2 == p3));
            if (float3.dot(verts[p3] - verts[p0], float3.cross(verts[p1] - verts[p0], verts[p2] - verts[p0])) < 0)
            {
-                Swap(ref p2, ref p3);
+                return new int4(p0, p1, p3, p2);
            }
            return new int4(p0, p1, p2, p3);
        }
@@ -1207,12 +1221,12 @@ namespace OpenSim.Region.PhysicsModules.ConvexDecompositionDotNet
            int j;
            float3 bmin = new float3(verts[0]);
            float3 bmax = new float3(verts[0]);
-            List<int> isextreme = new List<int>(verts.Count);
+            byte[] isextreme = new byte[verts.Count];
            byte[] allow = new byte[verts.Count];
            for (j = 0; j < verts.Count; j++)
            {
                allow[j] = 1;
-                isextreme.Add(0);
+                isextreme[j] = 0;
                bmin = float3.VectorMin(bmin, verts[j]);
                bmax = float3.VectorMax(bmax, verts[j]);
            }
@@ -1526,6 +1540,19 @@ namespace OpenSim.Region.PhysicsModules.ConvexDecompositionDotNet
            }
        }
+        public static bool ComputeHull(List<float3> vertices, out List<int> indices)
+        {
+            List<HullTriangle> tris = new List<HullTriangle>();
+            
+            bool ret = calchull(vertices, out indices, 0, tris);
+            if (ret == false)
+            {
+                indices = new List<int>();
+                return false;
+            }
+            return true;
+        }
        private static bool CleanupVertices(List<float3> svertices, out List<float3> vertices, float normalepsilon, out float3 scale)
        {
            const float EPSILON = 0.000001f;
diff --git a/OpenSim/Region/PhysicsModules/Ode/OdeScene.cs b/OpenSim/Region/PhysicsModules/Ode/OdeScene.cs
index 8f9bccb..ed2aad4 100644
--- a/OpenSim/Region/PhysicsModules/Ode/OdeScene.cs
+++ b/OpenSim/Region/PhysicsModules/Ode/OdeScene.cs
@@ -258,8 +258,6 @@ namespace OpenSim.Region.PhysicsModule.ODE
        private Random fluidRandomizer = new Random(Environment.TickCount);
-        public bool m_suportCombine = true;
        private uint m_regionWidth = Constants.RegionSize;
        private uint m_regionHeight = Constants.RegionSize;
@@ -542,8 +540,6 @@ namespace OpenSim.Region.PhysicsModule.ODE
            WorldExtents.Y = regionExtent.Y;
            m_regionHeight = (uint)regionExtent.Y;
                        
-            m_suportCombine = false;
-                        
            nearCallback = near;
            m_rayCastManager = new ODERayCastRequestManager(this);
@@ -1627,15 +1623,6 @@ namespace OpenSim.Region.PhysicsModule.ODE
        #endregion
-        public override void Combine(PhysicsScene pScene, Vector3 offset, Vector3 extents)
-        {
-            if (!m_suportCombine)
-                return;
-            m_worldOffset = offset;
-            WorldExtents = new Vector2(extents.X, extents.Y);
-            m_parentScene = pScene;
-        }
        // Recovered for use by fly height. Kitto Flora
        internal float GetTerrainHeightAtXY(float x, float y)
        {
@@ -1643,12 +1630,6 @@ namespace OpenSim.Region.PhysicsModule.ODE
            int offsetX = 0;
            int offsetY = 0;
-            if (m_suportCombine)
-            {
-                offsetX = ((int)(x / (int)Constants.RegionSize)) * (int)Constants.RegionSize;
-                offsetY = ((int)(y / (int)Constants.RegionSize)) * (int)Constants.RegionSize;
-            }
            if(RegionTerrain.TryGetValue(new Vector3(offsetX,offsetY,0), out heightFieldGeom))
            {
                if (heightFieldGeom != IntPtr.Zero)
@@ -3387,11 +3368,6 @@ namespace OpenSim.Region.PhysicsModule.ODE
            return waterlevel;
        }
-        public override bool SupportsCombining()
-        {
-            return m_suportCombine;
-        }
        public override void SetWaterLevel(float baseheight)
        {
            waterlevel = baseheight;
@@ -3452,6 +3428,11 @@ namespace OpenSim.Region.PhysicsModule.ODE
            }
        }
+        private int compareByCollisionsDesc(OdePrim A, OdePrim B)
+        {
+            return -A.CollisionScore.CompareTo(B.CollisionScore);
+        }
        public override Dictionary<uint, float> GetTopColliders()
        {
            Dictionary<uint, float> topColliders;
@@ -3459,7 +3440,7 @@ namespace OpenSim.Region.PhysicsModule.ODE
            lock (_prims)
            {
                List<OdePrim> orderedPrims = new List<OdePrim>(_prims);
-                orderedPrims.OrderByDescending(p => p.CollisionScore);
+                orderedPrims.Sort(compareByCollisionsDesc);
                topColliders = orderedPrims.Take(25).ToDictionary(p => p.LocalID, p => p.CollisionScore);
                foreach (OdePrim p in _prims)
diff --git a/OpenSim/Region/PhysicsModules/SharedBase/PhysicsActor.cs b/OpenSim/Region/PhysicsModules/SharedBase/PhysicsActor.cs
index 04ccbf0..250b155 100644
--- a/OpenSim/Region/PhysicsModules/SharedBase/PhysicsActor.cs
+++ b/OpenSim/Region/PhysicsModules/SharedBase/PhysicsActor.cs
@@ -55,6 +55,14 @@ namespace OpenSim.Region.PhysicsModules.SharedBase
        Absolute
    }
+    public struct CameraData
+    {
+        public Quaternion CameraRotation;
+        public Vector3 CameraAtAxis;
+        public bool MouseLook;
+        public bool Valid;
+    }
    public struct ContactPoint
    {
        public Vector3 Position;
@@ -159,13 +167,15 @@ namespace OpenSim.Region.PhysicsModules.SharedBase
        public delegate void RequestTerseUpdate();
        public delegate void CollisionUpdate(EventArgs e);
        public delegate void OutOfBounds(Vector3 pos);
+        public delegate CameraData GetCameraData();
-// disable warning: public events
+        // disable warning: public events
 #pragma warning disable 67
        public event PositionUpdate OnPositionUpdate;
        public event VelocityUpdate OnVelocityUpdate;
        public event OrientationUpdate OnOrientationUpdate;
        public event RequestTerseUpdate OnRequestTerseUpdate;
+        public event GetCameraData OnPhysicsRequestingCameraData;
        /// <summary>
        /// Subscribers to this event must synchronously handle the dictionary of collisions received, since the event
@@ -176,6 +186,17 @@ namespace OpenSim.Region.PhysicsModules.SharedBase
        public event OutOfBounds OnOutOfBounds;
 #pragma warning restore 67
+        public CameraData TryGetCameraData()
+        {
+            GetCameraData handler = OnPhysicsRequestingCameraData;
+            if (handler != null)
+            {
+                return handler();
+            }
+            return new CameraData { Valid = false };
+        }
        public static PhysicsActor Null
        {
            get { return new NullPhysicsActor(); }
diff --git a/OpenSim/Region/PhysicsModules/SharedBase/PhysicsScene.cs b/OpenSim/Region/PhysicsModules/SharedBase/PhysicsScene.cs
index 65d8867..aa51c4e 100644
--- a/OpenSim/Region/PhysicsModules/SharedBase/PhysicsScene.cs
+++ b/OpenSim/Region/PhysicsModules/SharedBase/PhysicsScene.cs
@@ -332,15 +332,6 @@ namespace OpenSim.Region.PhysicsModules.SharedBase
            return false;
        }
-        public virtual bool SupportsCombining()
-        {
-            return false;
-        }
-        public virtual void Combine(PhysicsScene pScene, Vector3 offset, Vector3 extents) {}
-        public virtual void CombineTerrain(float[] heightMap, Vector3 pOffset) {}
-        public virtual void UnCombine(PhysicsScene pScene) {}
        /// <summary>
        /// Queue a raycast against the physics scene.
        /// The provided callback method will be called when the raycast is complete
diff --git a/OpenSim/Region/PhysicsModules/ubOde/ODECharacter.cs b/OpenSim/Region/PhysicsModules/ubOde/ODECharacter.cs
index c9489d2..3a5a936 100644
--- a/OpenSim/Region/PhysicsModules/ubOde/ODECharacter.cs
+++ b/OpenSim/Region/PhysicsModules/ubOde/ODECharacter.cs
@@ -122,8 +122,7 @@ namespace OpenSim.Region.PhysicsModule.ubOde
        private float m_buoyancy = 0f;
        private bool m_freemove = false;
-        // private CollisionLocker ode;
+ 
 //        private string m_name = String.Empty;
        // other filter control
        int m_colliderfilter = 0;
@@ -1571,11 +1570,8 @@ namespace OpenSim.Region.PhysicsModule.ubOde
        {
            if (CollisionEventsThisFrame != null)
            {
-                lock (CollisionEventsThisFrame)
+                CollisionEventsThisFrame.Clear();
-                {
+                CollisionEventsThisFrame = null;
-                    CollisionEventsThisFrame.Clear();
-                    CollisionEventsThisFrame = null;
-                }
            }
            m_eventsubscription = 0;
            _parent_scene.RemoveCollisionEventReporting(this);
@@ -1585,11 +1581,8 @@ namespace OpenSim.Region.PhysicsModule.ubOde
        {
            if (CollisionEventsThisFrame == null)
                CollisionEventsThisFrame = new CollisionEventUpdate();
-            lock (CollisionEventsThisFrame)
+            CollisionEventsThisFrame.AddCollider(CollidedWith, contact);
-            {
+            _parent_scene.AddCollisionEventReporting(this);
-                CollisionEventsThisFrame.AddCollider(CollidedWith, contact);
-                _parent_scene.AddCollisionEventReporting(this);
-            }
        }
        public void SendCollisions(int timestep)
@@ -1600,28 +1593,25 @@ namespace OpenSim.Region.PhysicsModule.ubOde
            if (CollisionEventsThisFrame == null)
                return;
-            lock (CollisionEventsThisFrame)
+            if (m_cureventsubscription < m_eventsubscription)
-            {
+                return;
-                if (m_cureventsubscription < m_eventsubscription)
-                    return;
-                int ncolisions = CollisionEventsThisFrame.m_objCollisionList.Count;
+            int ncolisions = CollisionEventsThisFrame.m_objCollisionList.Count;
-                if (!SentEmptyCollisionsEvent || ncolisions > 0)
+            if (!SentEmptyCollisionsEvent || ncolisions > 0)
-                {
+            {
-                    base.SendCollisionUpdate(CollisionEventsThisFrame);
+                base.SendCollisionUpdate(CollisionEventsThisFrame);
-                    m_cureventsubscription = 0;
+                m_cureventsubscription = 0;
-                    if (ncolisions == 0)
+                if (ncolisions == 0)
-                    {
+                {
-                        SentEmptyCollisionsEvent = true;
+                    SentEmptyCollisionsEvent = true;
-//                        _parent_scene.RemoveCollisionEventReporting(this);
+//                  _parent_scene.RemoveCollisionEventReporting(this);
-                    }
+                }
-                    else
+                else
-                    {
+                {
-                        SentEmptyCollisionsEvent = false;
+                    SentEmptyCollisionsEvent = false;
-                        CollisionEventsThisFrame.Clear();
+                    CollisionEventsThisFrame.Clear();
-                    }
                }
            }           
        }
diff --git a/OpenSim/Region/PhysicsModules/ubOde/ODEDynamics.cs b/OpenSim/Region/PhysicsModules/ubOde/ODEDynamics.cs
index d8a2272..fa32441 100644
--- a/OpenSim/Region/PhysicsModules/ubOde/ODEDynamics.cs
+++ b/OpenSim/Region/PhysicsModules/ubOde/ODEDynamics.cs
@@ -648,6 +648,10 @@ namespace OpenSim.Region.PhysicsModule.ubOde
                    break;
            }
+            // disable mouse steering
+            m_flags &= ~(VehicleFlag.MOUSELOOK_STEER |
+                         VehicleFlag.MOUSELOOK_BANK  |
+                         VehicleFlag.CAMERA_DECOUPLED);
            m_lmDecay = (1.0f - 1.0f / m_linearMotorDecayTimescale);
            m_amDecay = 1.0f - 1.0f / m_angularMotorDecayTimescale;
@@ -794,6 +798,28 @@ namespace OpenSim.Region.PhysicsModule.ubOde
            float ldampZ = 0;
            
+            bool mousemode = false;
+            bool mousemodebank = false;
+            float bankingEfficiency;
+            float verticalAttractionTimescale = m_verticalAttractionTimescale;
+            if((m_flags & (VehicleFlag.MOUSELOOK_STEER | VehicleFlag.MOUSELOOK_BANK)) != 0 )
+            {
+                mousemode = true;
+                mousemodebank = (m_flags & VehicleFlag.MOUSELOOK_BANK) != 0;
+                if(mousemodebank)
+                {
+                    bankingEfficiency = m_bankingEfficiency;
+                    if(verticalAttractionTimescale < 149.9)
+                        verticalAttractionTimescale *= 2.0f; // reduce current instability
+                }
+                else
+                    bankingEfficiency = 0;
+            }
+            else
+                bankingEfficiency = m_bankingEfficiency;
            // linear motor
            if (m_lmEfect > 0.01 && m_linearMotorTimescale < 1000)
            {
@@ -930,12 +956,12 @@ namespace OpenSim.Region.PhysicsModule.ubOde
            }
            // vertical atractor
-            if (m_verticalAttractionTimescale < 300)
+            if (verticalAttractionTimescale < 300)
            {
                float roll;
                float pitch;
-                float ftmp = m_invtimestep / m_verticalAttractionTimescale / m_verticalAttractionTimescale;
+                float ftmp = m_invtimestep / verticalAttractionTimescale / verticalAttractionTimescale;
                float ftmp2;
                ftmp2 = 0.5f * m_verticalAttractionEfficiency * m_invtimestep;
@@ -967,7 +993,7 @@ namespace OpenSim.Region.PhysicsModule.ubOde
                    torque.Y += effpitch * ftmp;
                }
-                if (m_bankingEfficiency != 0 && Math.Abs(effroll) > 0.01)
+                if (bankingEfficiency != 0 && Math.Abs(effroll) > 0.01)
                {
                    float broll = effroll;
@@ -1018,58 +1044,129 @@ namespace OpenSim.Region.PhysicsModule.ubOde
                m_amdampZ = 1 / m_angularFrictionTimescale.Z;
            }
-            // angular motor
+            if(mousemode)
-            if (m_amEfect > 0.01 && m_angularMotorTimescale < 1000)
            {
-                tmpV = m_angularMotorDirection - curLocalAngVel; // velocity error
+                CameraData cam = rootPrim.TryGetCameraData();
-                tmpV *= m_amEfect / m_angularMotorTimescale; // error to correct in this timestep
+                if(cam.Valid && cam.MouseLook)
-                torque.X += tmpV.X * m_ampwr;
+                {
-                torque.Y += tmpV.Y * m_ampwr;
+                    Vector3 dirv = cam.CameraAtAxis * irotq;
-                torque.Z += tmpV.Z;
-                m_amEfect *= m_amDecay;
+                    float invamts = 1.0f/m_angularMotorTimescale;
-            }
+                    float tmp;
-            else
-                m_amEfect = 0;
-            // angular deflection
+                    // get out of x == 0 plane 
-            if (m_angularDeflectionEfficiency > 0)
+                    if(Math.Abs(dirv.X) < 0.001f)
-            {
+                        dirv.X = 0.001f;
-                Vector3 dirv;
-                
+                    if (Math.Abs(dirv.Z) > 0.01)
-                if (curLocalVel.X > 0.01f)
+                    {
-                    dirv = curLocalVel;
+                        tmp = -(float)Math.Atan2(dirv.Z, dirv.X) * m_angularMotorDirection.Y;
-                else if (curLocalVel.X < -0.01f)
+                        if(tmp < -4f)
-                    // use oposite 
+                            tmp = -4f;
-                    dirv = -curLocalVel;
+                        else if(tmp > 4f)
+                            tmp = 4f;
+                        torque.Y += (tmp - curLocalAngVel.Y) * invamts;
+                        torque.Y -= curLocalAngVel.Y * m_amdampY;
+                    }
+                    else 
+                        torque.Y -= curLocalAngVel.Y * m_invtimestep;
+                    if (Math.Abs(dirv.Y) > 0.01)
+                    {
+                        if(mousemodebank)
+                        {
+                            tmp = -(float)Math.Atan2(dirv.Y, dirv.X) * m_angularMotorDirection.X;
+                            if(tmp < -4f)
+                                tmp = -4f;
+                            else if(tmp > 4f)
+                                tmp = 4f;
+                            torque.X += (tmp - curLocalAngVel.X) * invamts;
+                        }
+                        else
+                        {
+                            tmp = (float)Math.Atan2(dirv.Y, dirv.X) * m_angularMotorDirection.Z;
+                            tmp *= invamts;
+                            if(tmp < -4f)
+                                tmp = -4f;
+                            else if(tmp > 4f)
+                                tmp = 4f;
+                            torque.Z += (tmp - curLocalAngVel.Z) * invamts;
+                        }
+                        torque.X -= curLocalAngVel.X * m_amdampX;
+                        torque.Z -= curLocalAngVel.Z * m_amdampZ;
+                    }
+                    else
+                    {
+                        if(mousemodebank)
+                            torque.X -= curLocalAngVel.X * m_invtimestep;
+                        else 
+                            torque.Z -= curLocalAngVel.Z * m_invtimestep;
+                    }
+                }
                else
                {
-                    // make it fall into small positive x case
+                    if (curLocalAngVel.X != 0 || curLocalAngVel.Y != 0 || curLocalAngVel.Z != 0)
-                    dirv.X = 0.01f;
+                    {
-                    dirv.Y = curLocalVel.Y;
+                        torque.X -= curLocalAngVel.X * 10f;
-                    dirv.Z = curLocalVel.Z;
+                        torque.Y -= curLocalAngVel.Y * 10f;
+                        torque.Z -= curLocalAngVel.Z * 10f;
+                    }
                }
+            }
+            else
+            {
+                // angular motor
+                if (m_amEfect > 0.01 && m_angularMotorTimescale < 1000)
+                {
+                    tmpV = m_angularMotorDirection - curLocalAngVel; // velocity error
+                    tmpV *= m_amEfect / m_angularMotorTimescale; // error to correct in this timestep
+                    torque.X += tmpV.X * m_ampwr;
+                    torque.Y += tmpV.Y * m_ampwr;
+                    torque.Z += tmpV.Z;
-                float ftmp = m_angularDeflectionEfficiency / m_angularDeflectionTimescale;
+                    m_amEfect *= m_amDecay;
+                }
+                else
+                    m_amEfect = 0;
-                if (Math.Abs(dirv.Z) > 0.01)
+                // angular deflection
+                if (m_angularDeflectionEfficiency > 0)
                {
-                    torque.Y += - (float)Math.Atan2(dirv.Z, dirv.X) * ftmp;
+                    Vector3 dirv;
+                
+                    if (curLocalVel.X > 0.01f)
+                        dirv = curLocalVel;
+                    else if (curLocalVel.X < -0.01f)
+                        // use oposite 
+                        dirv = -curLocalVel;
+                    else
+                    {
+                        // make it fall into small positive x case
+                        dirv.X = 0.01f;
+                        dirv.Y = curLocalVel.Y;
+                        dirv.Z = curLocalVel.Z;
+                    }
+                    float ftmp = m_angularDeflectionEfficiency / m_angularDeflectionTimescale;
+                    if (Math.Abs(dirv.Z) > 0.01)
+                    {
+                        torque.Y += - (float)Math.Atan2(dirv.Z, dirv.X) * ftmp;
+                    }
+                    if (Math.Abs(dirv.Y) > 0.01)
+                    {
+                        torque.Z += (float)Math.Atan2(dirv.Y, dirv.X) * ftmp;
+                    }
                }
-                if (Math.Abs(dirv.Y) > 0.01)
+                if (curLocalAngVel.X != 0 || curLocalAngVel.Y != 0 || curLocalAngVel.Z != 0)
                {
-                    torque.Z += (float)Math.Atan2(dirv.Y, dirv.X) * ftmp;
+                    torque.X -= curLocalAngVel.X * m_amdampX;
+                    torque.Y -= curLocalAngVel.Y * m_amdampY;
+                    torque.Z -= curLocalAngVel.Z * m_amdampZ;
                }
            }
-            // angular friction
-            if (curLocalAngVel.X != 0 || curLocalAngVel.Y != 0 || curLocalAngVel.Z != 0)
-            {
-                torque.X -= curLocalAngVel.X * m_amdampX;
-                torque.Y -= curLocalAngVel.Y * m_amdampY;
-                torque.Z -= curLocalAngVel.Z * m_amdampZ;
-            }
          
            force *= dmass.mass;
diff --git a/OpenSim/Region/PhysicsModules/ubOde/ODEPrim.cs b/OpenSim/Region/PhysicsModules/ubOde/ODEPrim.cs
index 6f2cbbe..4adf87e 100644
--- a/OpenSim/Region/PhysicsModules/ubOde/ODEPrim.cs
+++ b/OpenSim/Region/PhysicsModules/ubOde/ODEPrim.cs
@@ -306,7 +306,12 @@ namespace OpenSim.Region.PhysicsModule.ubOde
        public override uint LocalID
        {
            get { return m_localID; }
-            set { m_localID = value; }
+            set
+            {
+                uint oldid = m_localID;
+                m_localID = value;
+                _parent_scene.changePrimID(this, oldid);
+            }
        }
        public override PhysicsActor ParentActor
@@ -1066,8 +1071,10 @@ namespace OpenSim.Region.PhysicsModule.ubOde
        public OdePrim(String primName, ODEScene parent_scene, Vector3 pos, Vector3 size,
                       Quaternion rotation, PrimitiveBaseShape pbs, bool pisPhysical,bool pisPhantom,byte _shapeType,uint plocalID)
        {
+            _parent_scene = parent_scene;
            Name = primName;
-            LocalID = plocalID;
+            m_localID = plocalID;
            m_vehicle = null;
@@ -1113,7 +1120,6 @@ namespace OpenSim.Region.PhysicsModule.ubOde
            _pbs = pbs;
-            _parent_scene = parent_scene;
            m_targetSpace = IntPtr.Zero;
            if (pos.Z < 0)
@@ -1159,6 +1165,8 @@ namespace OpenSim.Region.PhysicsModule.ubOde
            m_OBBOffset = repData.OBBOffset;
            UpdatePrimBodyData();
+            AddChange(changes.Add, null);
        }
        private void resetCollisionAccounting()
@@ -2441,6 +2449,7 @@ namespace OpenSim.Region.PhysicsModule.ubOde
        private void changeadd()
        {
+            _parent_scene.addToPrims(this);
        }
        private void changeAngularLock(byte newLocks)
diff --git a/OpenSim/Region/PhysicsModules/ubOde/ODEScene.cs b/OpenSim/Region/PhysicsModules/ubOde/ODEScene.cs
index 6c5b405..e6aa7ef 100644
--- a/OpenSim/Region/PhysicsModules/ubOde/ODEScene.cs
+++ b/OpenSim/Region/PhysicsModules/ubOde/ODEScene.cs
@@ -30,6 +30,7 @@
 using System;
 using System.Collections.Generic;
+using System.Linq;
 using System.Reflection;
 using System.Runtime.InteropServices;
 using System.Threading;
@@ -170,7 +171,6 @@ namespace OpenSim.Region.PhysicsModule.ubOde
        private static readonly ILog m_log = LogManager.GetLogger(MethodBase.GetCurrentMethod().DeclaringType);
        public bool m_OSOdeLib = false;
-        public bool m_suportCombine = false; // mega suport not tested
        public Scene m_frameWorkScene = null;
 //        private int threadid = 0;
@@ -258,9 +258,9 @@ namespace OpenSim.Region.PhysicsModule.ubOde
        public ContactData[] m_materialContactsData = new ContactData[8];
-        private Dictionary<Vector3, IntPtr> RegionTerrain = new Dictionary<Vector3, IntPtr>();
+        private IntPtr TerrainGeom;
-        private Dictionary<IntPtr, float[]> TerrainHeightFieldHeights = new Dictionary<IntPtr, float[]>();
+        private float[] TerrainHeightFieldHeight;
-        private Dictionary<IntPtr, GCHandle> TerrainHeightFieldHeightsHandlers = new Dictionary<IntPtr, GCHandle>();
+        private GCHandle TerrainHeightFieldHeightsHandler = new GCHandle();
       
        private int m_physicsiterations = 15;
        private const float m_SkipFramesAtms = 0.40f; // Drop frames gracefully at a 400 ms lag
@@ -302,9 +302,7 @@ namespace OpenSim.Region.PhysicsModule.ubOde
        public int physics_logging_interval = 0;
        public bool physics_logging_append_existing_logfile = false;
-        private Vector3 m_worldOffset = Vector3.Zero;
        public Vector2 WorldExtents = new Vector2((int)Constants.RegionSize, (int)Constants.RegionSize);
-        private PhysicsScene m_parentScene = null;
        private ODERayCastRequestManager m_rayCastManager;
        public ODEMeshWorker m_meshWorker;
@@ -379,8 +377,6 @@ namespace OpenSim.Region.PhysicsModule.ubOde
            WorldExtents.Y = m_frameWorkScene.RegionInfo.RegionSizeY;
            m_regionHeight = (uint)WorldExtents.Y;
-            m_suportCombine = false;
            lock (OdeLock)
            {
                // Create the world and the first space
@@ -803,14 +799,6 @@ namespace OpenSim.Region.PhysicsModule.ubOde
                return;
            }
-            // update actors collision score
-            if (p1.CollisionScore >= float.MaxValue - count)
-                p1.CollisionScore = 0;
-            p1.CollisionScore += count;
-            if (p2.CollisionScore >= float.MaxValue - count)
-                p2.CollisionScore = 0;
-            p2.CollisionScore += count;
            // get first contact
            d.ContactGeom curContact = new d.ContactGeom();
@@ -1056,6 +1044,12 @@ namespace OpenSim.Region.PhysicsModule.ubOde
        {
            uint obj2LocalID = 0;
+            // update actors collision score
+            if (p1.CollisionScore < float.MaxValue)
+                p1.CollisionScore += 1.0f;
+            if (p2.CollisionScore < float.MaxValue)
+                p2.CollisionScore += 1.0f;
            bool p1events = p1.SubscribedEvents();
            bool p2events = p2.SubscribedEvents();
@@ -1328,8 +1322,6 @@ namespace OpenSim.Region.PhysicsModule.ubOde
            {
              
                newPrim = new OdePrim(name, this, position, size, rotation, pbs, isphysical, isPhantom, shapeType, localID);
-                lock (_prims)
-                    _prims[newPrim.LocalID] = newPrim;
            }
            return newPrim;
        }
@@ -1350,7 +1342,6 @@ namespace OpenSim.Region.PhysicsModule.ubOde
        public override PhysicsActor AddPrimShape(string primName, PrimitiveBaseShape pbs, Vector3 position,
                                                  Vector3 size, Quaternion rotation, bool isPhysical, bool isPhantom, byte shapeType, uint localid)
        {
            return AddPrim(primName, position, size, rotation, pbs, isPhysical,isPhantom, shapeType, localid);
        }
@@ -1396,6 +1387,12 @@ namespace OpenSim.Region.PhysicsModule.ubOde
        }
+        public void addToPrims(OdePrim prim)
+        {
+            lock (_prims)
+                _prims[prim.LocalID] = prim;
+        }
        public OdePrim getPrim(uint id)
        {
            lock (_prims)
@@ -1413,6 +1410,16 @@ namespace OpenSim.Region.PhysicsModule.ubOde
                return _prims.ContainsKey(prm.LocalID);
        }
+        public void changePrimID(OdePrim prim,uint oldID)
+        {
+            lock (_prims)
+            {
+                if(_prims.ContainsKey(oldID))
+                    _prims.Remove(oldID);
+                _prims[prim.LocalID] = prim;
+            }
+        }
+        
        public bool haveActor(PhysicsActor actor)
        {
            if (actor is OdePrim)
@@ -1922,30 +1929,15 @@ namespace OpenSim.Region.PhysicsModule.ubOde
        public float GetTerrainHeightAtXY(float x, float y)
        {
+            if (TerrainGeom == IntPtr.Zero)
-            int offsetX = 0;
-            int offsetY = 0;
-            if (m_suportCombine)
-            {
-                offsetX = ((int)(x / (int)Constants.RegionSize)) * (int)Constants.RegionSize;
-                offsetY = ((int)(y / (int)Constants.RegionSize)) * (int)Constants.RegionSize;
-            }
-            // get region map
-            IntPtr heightFieldGeom = IntPtr.Zero;
-            if (!RegionTerrain.TryGetValue(new Vector3(offsetX, offsetY, 0), out heightFieldGeom))
                return 0f;
-            if (heightFieldGeom == IntPtr.Zero)
+            if (TerrainHeightFieldHeight == null || TerrainHeightFieldHeight.Length == 0)
-                return 0f;
-            if (!TerrainHeightFieldHeights.ContainsKey(heightFieldGeom))
                return 0f;
            // TerrainHeightField for ODE as offset 1m
-            x += 1f - offsetX;
+            x += 1f;
-            y += 1f - offsetY;
+            y += 1f;
            // make position fit into array
            if (x < 0)
@@ -2024,7 +2016,7 @@ namespace OpenSim.Region.PhysicsModule.ubOde
            iy *= regsize;
            iy += ix; // all indexes have iy + ix
-            float[] heights = TerrainHeightFieldHeights[heightFieldGeom];
+            float[] heights = TerrainHeightFieldHeight;
            /*
                        if ((dx + dy) <= 1.0f)
                        {
@@ -2061,31 +2053,17 @@ namespace OpenSim.Region.PhysicsModule.ubOde
        public Vector3 GetTerrainNormalAtXY(float x, float y)
        {
-            int offsetX = 0;
-            int offsetY = 0;
-            if (m_suportCombine)
-            {
-                offsetX = ((int)(x / (int)Constants.RegionSize)) * (int)Constants.RegionSize;
-                offsetY = ((int)(y / (int)Constants.RegionSize)) * (int)Constants.RegionSize;
-            }
-            // get region map
-            IntPtr heightFieldGeom = IntPtr.Zero;
            Vector3 norm = new Vector3(0, 0, 1);
-            if (!RegionTerrain.TryGetValue(new Vector3(offsetX, offsetY, 0), out heightFieldGeom))
+            if (TerrainGeom == IntPtr.Zero)
-                return norm; ;
-            if (heightFieldGeom == IntPtr.Zero)
                return norm;
-            if (!TerrainHeightFieldHeights.ContainsKey(heightFieldGeom))
+            if (TerrainHeightFieldHeight == null || TerrainHeightFieldHeight.Length == 0)
                return norm;
            // TerrainHeightField for ODE as offset 1m
-            x += 1f - offsetX;
+            x += 1f;
-            y += 1f - offsetY;
+            y += 1f;
            // make position fit into array
            if (x < 0)
@@ -2172,7 +2150,7 @@ namespace OpenSim.Region.PhysicsModule.ubOde
            iy *= regsize;
            iy += ix; // all indexes have iy + ix
-            float[] heights = TerrainHeightFieldHeights[heightFieldGeom];
+            float[] heights = TerrainHeightFieldHeight;
            if (firstTri)
            {
@@ -2199,34 +2177,13 @@ namespace OpenSim.Region.PhysicsModule.ubOde
        public override void SetTerrain(float[] heightMap)
        {
-            if (m_worldOffset != Vector3.Zero && m_parentScene != null)
-            {
-                if (m_parentScene is ODEScene)
-                {
-                    ((ODEScene)m_parentScene).SetTerrain(heightMap, m_worldOffset);
-                }
-            }
-            else
-            {
-                SetTerrain(heightMap, m_worldOffset);
-            }
-        }
-        public override void CombineTerrain(float[] heightMap, Vector3 pOffset)
-        {
-            if(m_suportCombine)
-                SetTerrain(heightMap, pOffset);
-        }
-        public void SetTerrain(float[] heightMap, Vector3 pOffset)
-        {
            if (m_OSOdeLib)
-                OSSetTerrain(heightMap, pOffset);
+                OSSetTerrain(heightMap);
            else
-                OriSetTerrain(heightMap, pOffset);
+                OriSetTerrain(heightMap);
        }
-        public void OriSetTerrain(float[] heightMap, Vector3 pOffset)
+        public void OriSetTerrain(float[] heightMap)
        {
            // assumes 1m size grid and constante size square regions
            // needs to know about sims around in future
@@ -2291,45 +2248,40 @@ namespace OpenSim.Region.PhysicsModule.ubOde
            {
                d.AllocateODEDataForThread(~0U);
-                IntPtr GroundGeom = IntPtr.Zero;
+                if (TerrainGeom != IntPtr.Zero)
-                if (RegionTerrain.TryGetValue(pOffset, out GroundGeom))
                {
-                    RegionTerrain.Remove(pOffset);
+                    actor_name_map.Remove(TerrainGeom);
-                    if (GroundGeom != IntPtr.Zero)
+                    d.GeomDestroy(TerrainGeom);
-                    {
-                        actor_name_map.Remove(GroundGeom);
-                        d.GeomDestroy(GroundGeom);
-                        if (TerrainHeightFieldHeights.ContainsKey(GroundGeom))
-                            {
-                            TerrainHeightFieldHeightsHandlers[GroundGeom].Free();
-                            TerrainHeightFieldHeightsHandlers.Remove(GroundGeom);
-                            TerrainHeightFieldHeights.Remove(GroundGeom);
-                            }
-                    }
                }
+                if (TerrainHeightFieldHeightsHandler.IsAllocated)
+                    TerrainHeightFieldHeightsHandler.Free();
                IntPtr HeightmapData = d.GeomHeightfieldDataCreate();
-                GCHandle _heightmaphandler = GCHandle.Alloc(_heightmap, GCHandleType.Pinned);
+                GC.Collect(1);
+                TerrainHeightFieldHeightsHandler = GCHandle.Alloc(_heightmap, GCHandleType.Pinned);
-                d.GeomHeightfieldDataBuildSingle(HeightmapData, _heightmaphandler.AddrOfPinnedObject(), 0,
+                d.GeomHeightfieldDataBuildSingle(HeightmapData, TerrainHeightFieldHeightsHandler.AddrOfPinnedObject(), 0,
                                                heightmapHeight, heightmapWidth ,
                                                 (int)heightmapHeightSamples, (int)heightmapWidthSamples, scale,
                                                offset, thickness, wrap);
                d.GeomHeightfieldDataSetBounds(HeightmapData, hfmin - 1, hfmax + 1);
-                GroundGeom = d.CreateHeightfield(GroundSpace, HeightmapData, 1);
+                TerrainGeom = d.CreateHeightfield(GroundSpace, HeightmapData, 1);
-                if (GroundGeom != IntPtr.Zero)
+                if (TerrainGeom != IntPtr.Zero)
                {
-                    d.GeomSetCategoryBits(GroundGeom, (uint)(CollisionCategories.Land));
+                    d.GeomSetCategoryBits(TerrainGeom, (uint)(CollisionCategories.Land));
-                    d.GeomSetCollideBits(GroundGeom, 0);
+                    d.GeomSetCollideBits(TerrainGeom, 0);
                    PhysicsActor pa = new NullPhysicsActor();
                    pa.Name = "Terrain";
                    pa.PhysicsActorType = (int)ActorTypes.Ground;
-                    actor_name_map[GroundGeom] = pa;
+                    actor_name_map[TerrainGeom] = pa;
 //                    geom_name_map[GroundGeom] = "Terrain";
@@ -2339,16 +2291,16 @@ namespace OpenSim.Region.PhysicsModule.ubOde
                    q.Z = 0.5f;
                    q.W = 0.5f;
-                    d.GeomSetQuaternion(GroundGeom, ref q);
+                    d.GeomSetQuaternion(TerrainGeom, ref q);
-                    d.GeomSetPosition(GroundGeom, pOffset.X + m_regionWidth * 0.5f, pOffset.Y + m_regionHeight * 0.5f, 0.0f);
+                    d.GeomSetPosition(TerrainGeom, m_regionWidth * 0.5f, m_regionHeight * 0.5f, 0.0f);
-                    RegionTerrain.Add(pOffset, GroundGeom);
+                    TerrainHeightFieldHeight = _heightmap;
-                    TerrainHeightFieldHeights.Add(GroundGeom, _heightmap);
-                    TerrainHeightFieldHeightsHandlers.Add(GroundGeom, _heightmaphandler);
                }
+                else
+                    TerrainHeightFieldHeightsHandler.Free();
            }
        }
-        public void OSSetTerrain(float[] heightMap, Vector3 pOffset)
+        public void OSSetTerrain(float[] heightMap)
        {
            // assumes 1m size grid and constante size square regions
            // needs to know about sims around in future
@@ -2402,26 +2354,20 @@ namespace OpenSim.Region.PhysicsModule.ubOde
                }
                yt += heightmapWidthSamples;
            }
            lock (OdeLock)
            {
-                IntPtr GroundGeom = IntPtr.Zero;
+                if (TerrainGeom != IntPtr.Zero)
-                if (RegionTerrain.TryGetValue(pOffset, out GroundGeom))
                {
-                    RegionTerrain.Remove(pOffset);
+                    actor_name_map.Remove(TerrainGeom);
-                    if (GroundGeom != IntPtr.Zero)
+                    d.GeomDestroy(TerrainGeom);
-                    {
-                        actor_name_map.Remove(GroundGeom);
-                        d.GeomDestroy(GroundGeom);
-                        if (TerrainHeightFieldHeights.ContainsKey(GroundGeom))
-                        {
-                            if (TerrainHeightFieldHeightsHandlers[GroundGeom].IsAllocated)
-                                TerrainHeightFieldHeightsHandlers[GroundGeom].Free();
-                            TerrainHeightFieldHeightsHandlers.Remove(GroundGeom);
-                            TerrainHeightFieldHeights.Remove(GroundGeom);
-                        }
-                    }
                }
+                if (TerrainHeightFieldHeightsHandler.IsAllocated)
+                            TerrainHeightFieldHeightsHandler.Free();
+                TerrainHeightFieldHeight = null;
                IntPtr HeightmapData = d.GeomOSTerrainDataCreate();
                const int wrap = 0;
@@ -2429,32 +2375,31 @@ namespace OpenSim.Region.PhysicsModule.ubOde
                if (thickness < 0)
                    thickness = 1;
-                GCHandle _heightmaphandler = GCHandle.Alloc(_heightmap, GCHandleType.Pinned);
+                TerrainHeightFieldHeightsHandler = GCHandle.Alloc(_heightmap, GCHandleType.Pinned);
-                d.GeomOSTerrainDataBuild(HeightmapData, _heightmaphandler.AddrOfPinnedObject(), 0, 1.0f,
+                d.GeomOSTerrainDataBuild(HeightmapData, TerrainHeightFieldHeightsHandler.AddrOfPinnedObject(), 0, 1.0f,
                                                 (int)heightmapWidthSamples, (int)heightmapHeightSamples,
                                                 thickness, wrap);
 //                d.GeomOSTerrainDataSetBounds(HeightmapData, hfmin - 1, hfmax + 1);
-                GroundGeom = d.CreateOSTerrain(GroundSpace, HeightmapData, 1);
+                TerrainGeom = d.CreateOSTerrain(GroundSpace, HeightmapData, 1);
-                if (GroundGeom != IntPtr.Zero)
+                if (TerrainGeom != IntPtr.Zero)
                {
-                    d.GeomSetCategoryBits(GroundGeom, (uint)(CollisionCategories.Land));
+                    d.GeomSetCategoryBits(TerrainGeom, (uint)(CollisionCategories.Land));
-                    d.GeomSetCollideBits(GroundGeom, 0);
+                    d.GeomSetCollideBits(TerrainGeom, 0);
                    PhysicsActor pa = new NullPhysicsActor();
                    pa.Name = "Terrain";
                    pa.PhysicsActorType = (int)ActorTypes.Ground;
-                    actor_name_map[GroundGeom] = pa;
+                    actor_name_map[TerrainGeom] = pa;
 //                    geom_name_map[GroundGeom] = "Terrain";
-                    d.GeomSetPosition(GroundGeom, pOffset.X + m_regionWidth * 0.5f, pOffset.Y + m_regionHeight * 0.5f, 0.0f);
+                    d.GeomSetPosition(TerrainGeom, m_regionWidth * 0.5f, m_regionHeight * 0.5f, 0.0f);
-                    RegionTerrain.Add(pOffset, GroundGeom);
+                    TerrainHeightFieldHeight = _heightmap;
-                    TerrainHeightFieldHeights.Add(GroundGeom, _heightmap);
+                 }
-                    TerrainHeightFieldHeightsHandlers.Add(GroundGeom, _heightmaphandler);
+                 else
-                }
+                    TerrainHeightFieldHeightsHandler.Free();
            }
        }
@@ -2467,11 +2412,6 @@ namespace OpenSim.Region.PhysicsModule.ubOde
            return waterlevel;
        }
-        public override bool SupportsCombining()
-        {
-            return m_suportCombine;
-        }
        public override void SetWaterLevel(float baseheight)
        {
            waterlevel = baseheight;
@@ -2518,26 +2458,14 @@ namespace OpenSim.Region.PhysicsModule.ubOde
                foreach (OdeCharacter ch in chtorem)
                    ch.DoAChange(changes.Remove, null);
+                if (TerrainGeom != IntPtr.Zero)
+                        d.GeomDestroy(TerrainGeom);
+                TerrainGeom = IntPtr.Zero;
-                foreach (IntPtr GroundGeom in RegionTerrain.Values)
+                if (TerrainHeightFieldHeightsHandler.IsAllocated)
-                {
+                    TerrainHeightFieldHeightsHandler.Free();
-                    if (GroundGeom != IntPtr.Zero)
-                        d.GeomDestroy(GroundGeom);
-                }
-                RegionTerrain.Clear();
+                TerrainHeightFieldHeight = null;
-                if (TerrainHeightFieldHeightsHandlers.Count > 0)
-                {
-                    foreach (GCHandle gch in TerrainHeightFieldHeightsHandlers.Values)
-                    {
-                        if (gch.IsAllocated)
-                            gch.Free();
-                    }
-                }
-                TerrainHeightFieldHeightsHandlers.Clear();
-                TerrainHeightFieldHeights.Clear();
                if (ContactgeomsArray != IntPtr.Zero)
                {
@@ -2556,27 +2484,22 @@ namespace OpenSim.Region.PhysicsModule.ubOde
            }
        }
+        private int compareByCollisionsDesc(OdePrim A, OdePrim B)
+        {
+            return -A.CollisionScore.CompareTo(B.CollisionScore);
+        }
        public override Dictionary<uint, float> GetTopColliders()
        {
-            Dictionary<uint, float> returncolliders = new Dictionary<uint, float>();
+            Dictionary<uint, float> topColliders;
-            int cnt = 0;
+            List<OdePrim> orderedPrims;
-            lock (_prims)
+            lock (_activeprims)
-            {
+                orderedPrims = new List<OdePrim>(_activeprims);
-                foreach (OdePrim prm in _prims.Values)
-                {
+            orderedPrims.Sort(compareByCollisionsDesc);
-                    if (prm.CollisionScore > 0)
+            topColliders = orderedPrims.Take(25).ToDictionary(p => p.LocalID, p => p.CollisionScore);
-                    {
+           
-                        returncolliders.Add(prm.LocalID, prm.CollisionScore);
+            return topColliders;
-                        cnt++;
-                        prm.CollisionScore = 0f;
-                        if (cnt > 25)
-                        {
-                            break;
-                        }
-                    }
-                }
-            }
-            return returncolliders;
        }
        public override bool SupportsRayCast()
diff --git a/OpenSim/Region/PhysicsModules/ubOdeMeshing/Meshmerizer.cs b/OpenSim/Region/PhysicsModules/ubOdeMeshing/Meshmerizer.cs
index 6e43cf8..d9544db 100644
--- a/OpenSim/Region/PhysicsModules/ubOdeMeshing/Meshmerizer.cs
+++ b/OpenSim/Region/PhysicsModules/ubOdeMeshing/Meshmerizer.cs
@@ -121,9 +121,9 @@ namespace OpenSim.Region.PhysicsModule.ubODEMeshing
                CacheExpire = TimeSpan.FromHours(fcache);
                
-                if(doMeshFileCache && cachePath != "")
+                lock (diskLock)
                {
-                    lock (diskLock)
+                    if(doMeshFileCache && cachePath != "")
                    {
                        try
                        {
@@ -619,7 +619,7 @@ namespace OpenSim.Region.PhysicsModule.ubODEMeshing
                                    vs.Clear(); 
                                    continue;
                                }
+/*
                                if (!HullUtils.ComputeHull(vs, ref hullr, 0, 0.0f))
                                {
                                    vs.Clear();
@@ -657,6 +657,45 @@ namespace OpenSim.Region.PhysicsModule.ubODEMeshing
                                    f = new Face(vertsoffset + t1, vertsoffset + t2, vertsoffset + t3);
                                    faces.Add(f);
                                }
+*/
+                                List<int> indices;
+                                if (!HullUtils.ComputeHull(vs, out indices))
+                                {
+                                    vs.Clear();
+                                    continue;
+                                }
+                                nverts = vs.Count;
+                                nindexs = indices.Count;
+                                if (nindexs % 3 != 0)
+                                {
+                                    vs.Clear();
+                                    continue;
+                                }
+                                for (i = 0; i < nverts; i++)
+                                {
+                                    c.X = vs[i].x;
+                                    c.Y = vs[i].y;
+                                    c.Z = vs[i].z;
+                                    coords.Add(c);
+                                }
+                               
+                                for (i = 0; i < nindexs; i += 3)
+                                {
+                                    t1 = indices[i];
+                                    if (t1 > nverts)
+                                        break;
+                                    t2 = indices[i + 1];
+                                    if (t2 > nverts)
+                                        break;
+                                    t3 = indices[i + 2];
+                                    if (t3 > nverts)
+                                        break;
+                                    f = new Face(vertsoffset + t1, vertsoffset + t2, vertsoffset + t3);
+                                    faces.Add(f);
+                                }
                                vertsoffset += nverts;
                                vs.Clear();
                            }
@@ -686,13 +725,15 @@ namespace OpenSim.Region.PhysicsModule.ubODEMeshing
                            vs.Add(f3);
                        }
-                        if (vs.Count < 3)
+                        nverts = vs.Count;
+                        if (nverts < 3)
                        {
                            vs.Clear();
                            return false;
                        }
-                        if (vs.Count < 5)
+                        if (nverts < 5)
                        {
                            foreach (float3 point in vs)
                            {
@@ -701,10 +742,11 @@ namespace OpenSim.Region.PhysicsModule.ubODEMeshing
                                c.Z = point.z;
                                coords.Add(c);
                            }
                            f = new Face(0, 1, 2);
                            faces.Add(f);
-                            if (vs.Count == 4)
+                            if (nverts == 4)
                            {
                                f = new Face(0, 2, 3);
                                faces.Add(f);
@@ -716,7 +758,7 @@ namespace OpenSim.Region.PhysicsModule.ubODEMeshing
                            vs.Clear();
                            return true;
                        }
+/*
                        if (!HullUtils.ComputeHull(vs, ref hullr, 0, 0.0f))
                            return false;
@@ -747,7 +789,38 @@ namespace OpenSim.Region.PhysicsModule.ubODEMeshing
                            f = new Face(t1, t2, t3);
                            faces.Add(f);
                        }
+*/
+                        List<int> indices;
+                        if (!HullUtils.ComputeHull(vs, out indices))
+                            return false;
+                        nindexs = indices.Count;
+                        if (nindexs % 3 != 0)
+                            return false;
+                        for (i = 0; i < nverts; i++)
+                        {
+                            c.X = vs[i].x;
+                            c.Y = vs[i].y;
+                            c.Z = vs[i].z;
+                            coords.Add(c);
+                        }
+                        for (i = 0; i < nindexs; i += 3)
+                        {
+                            t1 = indices[i];
+                            if (t1 > nverts)
+                                break;
+                            t2 = indices[i + 1];
+                            if (t2 > nverts)
+                                break;
+                            t3 = indices[i + 2];
+                            if (t3 > nverts)
+                                break;
+                            f = new Face(t1, t2, t3);
+                            faces.Add(f);
+                        }
+                        vs.Clear();
                        if (coords.Count > 0 && faces.Count > 0)
                            return true;
                    }
diff --git a/OpenSim/Region/PhysicsModules/ubOdeMeshing/SculptMap.cs b/OpenSim/Region/PhysicsModules/ubOdeMeshing/SculptMap.cs
index 1c75db6..2ca2af7 100644
--- a/OpenSim/Region/PhysicsModules/ubOdeMeshing/SculptMap.cs
+++ b/OpenSim/Region/PhysicsModules/ubOdeMeshing/SculptMap.cs
@@ -57,7 +57,7 @@ namespace PrimMesher
            int numLodPixels = lod * lod;  // (32 * 2)^2  = 64^2 pixels for default sculpt map image
            bool needsScaling = false;
-            bool smallMap = false;
+            bool smallMap = false;          
            width = bmW;
            height = bmH;
@@ -69,16 +69,8 @@ namespace PrimMesher
                needsScaling = true;
            }
-            try
+            if (needsScaling)
-            {
+                bm = ScaleImage(bm, width, height);
-                if (needsScaling)
-                    bm = ScaleImage(bm, width, height);
-            }
-            catch (Exception e)
-            {
-                throw new Exception("Exception in ScaleImage(): e: " + e.ToString());
-            }
            if (width * height > numLodPixels)
            {
@@ -129,11 +121,15 @@ namespace PrimMesher
            }
            catch (Exception e)
            {
+                if (needsScaling)
+                    bm.Dispose();
                throw new Exception("Caught exception processing byte arrays in SculptMap(): e: " + e.ToString());
            }
            width++;
            height++;
+            if(needsScaling)
+                bm.Dispose();
        }
        public List<List<Coord>> ToRows(bool mirror)
@@ -168,11 +164,9 @@ namespace PrimMesher
        private Bitmap ScaleImage(Bitmap srcImage, int destWidth, int destHeight)
        {
            Bitmap scaledImage = new Bitmap(destWidth, destHeight, PixelFormat.Format24bppRgb);
            Color c;
-            
            // will let last step to be eventually diferent, as seems to be in sl
diff --git a/OpenSim/Region/ScriptEngine/Shared/Api/Implementation/LSL_Api.cs b/OpenSim/Region/ScriptEngine/Shared/Api/Implementation/LSL_Api.cs
index ce0e59c..66cb30c 100644
--- a/OpenSim/Region/ScriptEngine/Shared/Api/Implementation/LSL_Api.cs
+++ b/OpenSim/Region/ScriptEngine/Shared/Api/Implementation/LSL_Api.cs
@@ -4323,6 +4323,8 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api
                return;           
            SceneObjectPart targetPart = World.GetSceneObjectPart((UUID)targetID);
+            if (targetPart == null)
+                return;
            if (targetPart.ParentGroup.AttachmentPoint != 0)
                return; // Fail silently if attached
@@ -4332,24 +4334,22 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api
            SceneObjectGroup parentPrim = null, childPrim = null;
-            if (targetPart != null)
+            if (parent != 0)
            {
-                if (parent != 0)
+                parentPrim = m_host.ParentGroup;
-                {
+                childPrim = targetPart.ParentGroup;
-                    parentPrim = m_host.ParentGroup;
+            }
-                    childPrim = targetPart.ParentGroup;
+            else
-                }
+            {
-                else
+                parentPrim = targetPart.ParentGroup;
-                {
+                childPrim = m_host.ParentGroup;
-                    parentPrim = targetPart.ParentGroup;
-                    childPrim = m_host.ParentGroup;
-                }
-                // Required for linking
-                childPrim.RootPart.ClearUpdateSchedule();
-                parentPrim.LinkToGroup(childPrim, true);
            }
+            // Required for linking
+            childPrim.RootPart.ClearUpdateSchedule();
+            parentPrim.LinkToGroup(childPrim, true);
            parentPrim.TriggerScriptChangedEvent(Changed.LINK);
            parentPrim.RootPart.CreateSelected = true;
            parentPrim.HasGroupChanged = true;
@@ -4741,20 +4741,10 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api
        {
            m_host.AddScriptLPS(1);
            Vector3 av3 = Util.Clip(color, 0.0f, 1.0f);
-            if (text.Length > 254)
-                text = text.Remove(254);
            byte[] data;
-            do
+            data = Util.StringToBytes256(text);
-            {
+            text = Util.UTF8.GetString(data);
-                data = Util.UTF8.GetBytes(text);
-                if (data.Length > 254)
-                    text = text.Substring(0, text.Length - 1);
-            } while (data.Length > 254);
            m_host.SetText(text, av3, Util.Clip((float)alpha, 0.0f, 1.0f));
-            //m_host.ParentGroup.HasGroupChanged = true;
-            //m_host.ParentGroup.ScheduleGroupForFullUpdate();
        }
        public LSL_Float llWater(LSL_Vector offset)
@@ -5118,13 +5108,23 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api
            {
                m_host.CollisionSoundVolume = (float)impact_volume;
                m_host.CollisionSound = m_host.invalidCollisionSoundUUID;
-                m_host.CollisionSoundType = 0;
+                m_host.CollisionSoundType = -1; // disable all sounds
+                m_host.aggregateScriptEvents();
                return;
            }
            // TODO: Parameter check logic required.
-            m_host.CollisionSound = ScriptUtils.GetAssetIdFromKeyOrItemName(m_host, impact_sound, AssetType.Sound);
+            UUID soundId = ScriptUtils.GetAssetIdFromKeyOrItemName(m_host, impact_sound, AssetType.Sound);
-            m_host.CollisionSoundVolume = (float)impact_volume;
+            if(soundId != UUID.Zero)
-            m_host.CollisionSoundType = 1;
+            {
+                m_host.CollisionSound = soundId;
+                m_host.CollisionSoundVolume = (float)impact_volume;
+                m_host.CollisionSoundType = 1;
+            }
+            else
+                 m_host.CollisionSoundType = -1;
+            m_host.aggregateScriptEvents();
        }
        public LSL_String llGetAnimation(string id)
@@ -14679,13 +14679,13 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api
                            msAvailable -= m_castRayCalls[i].UsedMs;
                    }
                }
-            }
-            // Return failure if not enough available time
+                // Return failure if not enough available time
-            if (msAvailable < m_msMinInCastRay)
+                if (msAvailable < m_msMinInCastRay)
-            {
+                {
-                result.Add(new LSL_Integer(ScriptBaseClass.RCERR_CAST_TIME_EXCEEDED));
+                    result.Add(new LSL_Integer(ScriptBaseClass.RCERR_CAST_TIME_EXCEEDED));
-                return result;
+                    return result;
+                }
            }
            // Initialize
@@ -15073,13 +15073,13 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api
            // Add to throttle data
            stopWatch.Stop();
-            CastRayCall castRayCall = new CastRayCall();
-            castRayCall.RegionId = regionId;
-            castRayCall.UserId = userId;
-            castRayCall.CalledMs = calledMs;
-            castRayCall.UsedMs = (int)stopWatch.ElapsedMilliseconds;
            lock (m_castRayCalls)
            {
+                CastRayCall castRayCall = new CastRayCall();
+                castRayCall.RegionId = regionId;
+                castRayCall.UserId = userId;
+                castRayCall.CalledMs = calledMs;
+                castRayCall.UsedMs = (int)stopWatch.ElapsedMilliseconds;
                m_castRayCalls.Add(castRayCall);
            }
diff --git a/OpenSim/Region/ScriptEngine/Shared/Api/Implementation/OSSL_Api.cs b/OpenSim/Region/ScriptEngine/Shared/Api/Implementation/OSSL_Api.cs
index e525a2e..4af4339 100644
--- a/OpenSim/Region/ScriptEngine/Shared/Api/Implementation/OSSL_Api.cs
+++ b/OpenSim/Region/ScriptEngine/Shared/Api/Implementation/OSSL_Api.cs
@@ -45,6 +45,7 @@ using OpenSim.Framework;
 using OpenSim.Framework.Console;
 using OpenSim.Region.Framework.Interfaces;
 using OpenSim.Region.Framework.Scenes;
+using OpenSim.Region.Framework.Scenes.Scripting;
 using OpenSim.Region.ScriptEngine.Shared;
 using OpenSim.Region.ScriptEngine.Shared.Api.Plugins;
 using OpenSim.Region.ScriptEngine.Shared.ScriptBase;
@@ -4250,5 +4251,48 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api
                return m_UrlModule.RequestSecureURL(m_ScriptEngine.ScriptModule, m_host, m_item.ItemID, opts).ToString();
            return UUID.Zero.ToString();
        }
+        public void osCollisionSound(string impact_sound, double impact_volume)
+        {
+            m_host.AddScriptLPS(1);
+            if(impact_sound == "")
+            {
+                m_host.CollisionSoundVolume = (float)impact_volume;
+                m_host.CollisionSound = m_host.invalidCollisionSoundUUID;
+                if(impact_volume == 0.0)
+                    m_host.CollisionSoundType = -1; // disable all sounds
+                else if(impact_volume == 1.0f)
+                    m_host.CollisionSoundType = 0; // full return to default sounds
+                else
+                    m_host.CollisionSoundType = 2; // default sounds with volume
+                m_host.aggregateScriptEvents();           
+                return;
+            }
+            // TODO: Parameter check logic required.
+            UUID soundId = ScriptUtils.GetAssetIdFromKeyOrItemName(m_host, impact_sound, AssetType.Sound);
+            if(soundId != UUID.Zero)
+            {
+                m_host.CollisionSound = soundId;
+                m_host.CollisionSoundVolume = (float)impact_volume;
+                m_host.CollisionSoundType = 1;
+            }
+            else
+                 m_host.CollisionSoundType = -1;
+            m_host.aggregateScriptEvents();           
+        }
+        // still not very usefull, detector is lost on rez, restarts, etc
+        public void osVolumeDetect(int detect)
+        {
+            m_host.AddScriptLPS(1);
+            if (m_host.ParentGroup == null || m_host.ParentGroup.IsDeleted || m_host.ParentGroup.IsAttachment)
+                return;
+            m_host.ScriptSetVolumeDetect(detect != 0);
+        }
    }
 }
diff --git a/OpenSim/Region/ScriptEngine/Shared/Api/Interface/IOSSL_Api.cs b/OpenSim/Region/ScriptEngine/Shared/Api/Interface/IOSSL_Api.cs
index c99679e..5ce859e 100644
--- a/OpenSim/Region/ScriptEngine/Shared/Api/Interface/IOSSL_Api.cs
+++ b/OpenSim/Region/ScriptEngine/Shared/Api/Interface/IOSSL_Api.cs
@@ -476,5 +476,7 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api.Interfaces
        LSL_String osRequestURL(LSL_List options);
        LSL_String osRequestSecureURL(LSL_List options);
+        void osCollisionSound(string impact_sound, double impact_volume);
+        void osVolumeDetect(int detect);
    }
 }
diff --git a/OpenSim/Region/ScriptEngine/Shared/Api/Runtime/OSSL_Stub.cs b/OpenSim/Region/ScriptEngine/Shared/Api/Runtime/OSSL_Stub.cs
index 35eee59..c5cb88e 100644
--- a/OpenSim/Region/ScriptEngine/Shared/Api/Runtime/OSSL_Stub.cs
+++ b/OpenSim/Region/ScriptEngine/Shared/Api/Runtime/OSSL_Stub.cs
@@ -1089,5 +1089,15 @@ namespace OpenSim.Region.ScriptEngine.Shared.ScriptBase
        {
            return m_OSSL_Functions.osRequestSecureURL(options);
        }
+        public void osCollisionSound(string impact_sound, double impact_volume)
+        {
+            m_OSSL_Functions.osCollisionSound(impact_sound, impact_volume);
+        }
+        public void osVolumeDetect(int detect)
+        {
+            m_OSSL_Functions.osVolumeDetect(detect);
+        }
    }
 }
diff --git a/OpenSim/Region/ScriptEngine/Shared/CodeTools/CSCodeGenerator.cs b/OpenSim/Region/ScriptEngine/Shared/CodeTools/CSCodeGenerator.cs
index 4e0c273..bc6ce4f 100644
--- a/OpenSim/Region/ScriptEngine/Shared/CodeTools/CSCodeGenerator.cs
+++ b/OpenSim/Region/ScriptEngine/Shared/CodeTools/CSCodeGenerator.cs
@@ -26,6 +26,7 @@
 */
 using System;
+using System.Text;
 using System.IO;
 using System.Collections.Generic;
 using System.Reflection;
@@ -39,9 +40,9 @@ namespace OpenSim.Region.ScriptEngine.Shared.CodeTools
    {
 //      private static readonly ILog m_log = LogManager.GetLogger(MethodBase.GetCurrentMethod().DeclaringType);
+        private static yyLSLSyntax yyLSL = new yyLSLSyntax();
        private SYMBOL m_astRoot = null;
        private Dictionary<KeyValuePair<int, int>, KeyValuePair<int, int>> m_positionMap;
-        private int m_indentWidth = 4;  // for indentation
        private int m_braceCount;       // for indentation
        private int m_CSharpLine;       // the current line of generated C# code
        private int m_CSharpCol;        // the current column of generated C# code
@@ -94,6 +95,16 @@ namespace OpenSim.Region.ScriptEngine.Shared.CodeTools
            get { return m_astRoot; }
        }
+        public void Clear()
+        {
+            m_astRoot.kids = null;
+            m_astRoot.yylx = null;
+            m_astRoot.yyps = null;
+            m_astRoot = null;
+            m_positionMap = null;
+            m_warnings.Clear();
+            m_comms = null;
+        }
        /// <summary>
        /// Resets various counters and metadata.
        /// </summary>
@@ -106,18 +117,26 @@ namespace OpenSim.Region.ScriptEngine.Shared.CodeTools
            m_astRoot = null;
        }
+        public string Convert(string script)
+        {
+            StringBuilder sb = new StringBuilder(4096);
+            Convert(script, sb);
+            return sb.ToString();
+        }
        /// <summary>
        /// Generate the code from the AST we have.
        /// </summary>
        /// <param name="script">The LSL source as a string.</param>
        /// <returns>String containing the generated C# code.</returns>
-        public string Convert(string script)
+        public void Convert(string script, StringBuilder sb)
        {
 //            m_log.DebugFormat("[CS CODE GENERATOR]: Converting to C#\n{0}", script);
            m_warnings.Clear();
            ResetCounters();
-            Parser p = new LSLSyntax(new yyLSLSyntax(), new ErrorHandler(true));
+            ErrorHandler errorHandler = new ErrorHandler(true);
+            Parser p = new LSLSyntax(yyLSL, errorHandler);
            LSL2CSCodeTransformer codeTransformer;
            try
@@ -148,38 +167,39 @@ namespace OpenSim.Region.ScriptEngine.Shared.CodeTools
            m_astRoot = codeTransformer.Transform();
-            string retstr = String.Empty;
            // standard preamble
-            //retstr = GenerateLine("using OpenSim.Region.ScriptEngine.Common;");
-            //retstr += GenerateLine("using System.Collections.Generic;");
-            //retstr += GenerateLine("");
-            //retstr += GenerateLine("namespace SecondLife");
-            //retstr += GenerateLine("{");
            m_braceCount++;
-            //retstr += GenerateIndentedLine("public class Script : OpenSim.Region.ScriptEngine.Common");
-            //retstr += GenerateIndentedLine("{");
            m_braceCount++;
            // line number
-            m_CSharpLine += 9;
+            m_CSharpLine += 10;
            // here's the payload
-            retstr += GenerateLine();
+            sb.Append("\n");
            foreach (SYMBOL s in m_astRoot.kids)
-                retstr += GenerateNode(m_astRoot, s);
+                GenerateNodeToSB(m_astRoot, s, sb);
+            codeTransformer = null;
+            p.m_lexer.m_buf=null;
+            p.m_lexer.yytext = null;
+            p.m_lexer = null;
+            p.m_symbols = null;
+            p = null;
+            errorHandler = null;
            // close braces!
-            m_braceCount--;
+//            m_braceCount--;
            //retstr += GenerateIndentedLine("}");
-            m_braceCount--;
+//            m_braceCount--;
            //retstr += GenerateLine("}");
            // Removes all carriage return characters which may be generated in Windows platform. Is there
            // cleaner way of doing this?
-            retstr = retstr.Replace("\r", "");
+//            sb.Replace("\r", "");
-            return retstr;
        }
        /// <summary>
@@ -206,78 +226,76 @@ namespace OpenSim.Region.ScriptEngine.Shared.CodeTools
        /// <param name="previousSymbol">The parent node.</param>
        /// <param name="s">The current node to generate code for.</param>
        /// <returns>String containing C# code for SYMBOL s.</returns>
-        private string GenerateNode(SYMBOL previousSymbol, SYMBOL s)
+        private void GenerateNodeToSB(SYMBOL previousSymbol, SYMBOL s, StringBuilder sb)
        {
-            string retstr = String.Empty;
            // make sure to put type lower in the inheritance hierarchy first
            // ie: since IdentArgument and ExpressionArgument inherit from
            // Argument, put IdentArgument and ExpressionArgument before Argument
            if (s is GlobalFunctionDefinition)
-                retstr += GenerateGlobalFunctionDefinition((GlobalFunctionDefinition) s);
+                GenerateGlobalFunctionDefinition((GlobalFunctionDefinition) s, sb);
            else if (s is GlobalVariableDeclaration)
-                retstr += GenerateGlobalVariableDeclaration((GlobalVariableDeclaration) s);
+                GenerateGlobalVariableDeclaration((GlobalVariableDeclaration) s , sb);
            else if (s is State)
-                retstr += GenerateState((State) s);
+                GenerateState((State) s, sb);
            else if (s is CompoundStatement)
-                retstr += GenerateCompoundStatement(previousSymbol, (CompoundStatement) s);
+                GenerateCompoundStatement(previousSymbol, (CompoundStatement) s, sb);
            else if (s is Declaration)
-                retstr += GenerateDeclaration((Declaration) s);
+                GenerateDeclaration((Declaration) s, sb);
            else if (s is Statement)
-                retstr += GenerateStatement(previousSymbol, (Statement) s);
+                GenerateStatement(previousSymbol, (Statement) s, sb);
            else if (s is ReturnStatement)
-                retstr += GenerateReturnStatement((ReturnStatement) s);
+                GenerateReturnStatement((ReturnStatement) s, sb);
            else if (s is JumpLabel)
-                retstr += GenerateJumpLabel((JumpLabel) s);
+                GenerateJumpLabel((JumpLabel) s, sb);
            else if (s is JumpStatement)
-                retstr += GenerateJumpStatement((JumpStatement) s);
+                GenerateJumpStatement((JumpStatement) s, sb);
            else if (s is StateChange)
-                retstr += GenerateStateChange((StateChange) s);
+                GenerateStateChange((StateChange) s, sb);
            else if (s is IfStatement)
-                retstr += GenerateIfStatement((IfStatement) s);
+                GenerateIfStatement((IfStatement) s, sb);
            else if (s is WhileStatement)
-                retstr += GenerateWhileStatement((WhileStatement) s);
+                GenerateWhileStatement((WhileStatement) s, sb);
            else if (s is DoWhileStatement)
-                retstr += GenerateDoWhileStatement((DoWhileStatement) s);
+                GenerateDoWhileStatement((DoWhileStatement) s, sb);
            else if (s is ForLoop)
-                retstr += GenerateForLoop((ForLoop) s);
+                GenerateForLoop((ForLoop) s, sb);
            else if (s is ArgumentList)
-                retstr += GenerateArgumentList((ArgumentList) s);
+                GenerateArgumentList((ArgumentList) s, sb);
            else if (s is Assignment)
-                retstr += GenerateAssignment((Assignment) s);
+                GenerateAssignment((Assignment) s, sb);
            else if (s is BinaryExpression)
-                retstr += GenerateBinaryExpression((BinaryExpression) s);
+                GenerateBinaryExpression((BinaryExpression) s, sb);
            else if (s is ParenthesisExpression)
-                retstr += GenerateParenthesisExpression((ParenthesisExpression) s);
+                GenerateParenthesisExpression((ParenthesisExpression) s, sb);
            else if (s is UnaryExpression)
-                retstr += GenerateUnaryExpression((UnaryExpression) s);
+                GenerateUnaryExpression((UnaryExpression) s, sb);
            else if (s is IncrementDecrementExpression)
-                retstr += GenerateIncrementDecrementExpression((IncrementDecrementExpression) s);
+                GenerateIncrementDecrementExpression((IncrementDecrementExpression) s, sb);
            else if (s is TypecastExpression)
-                retstr += GenerateTypecastExpression((TypecastExpression) s);
+                GenerateTypecastExpression((TypecastExpression) s, sb);
            else if (s is FunctionCall)
-                retstr += GenerateFunctionCall((FunctionCall) s);
+                GenerateFunctionCall((FunctionCall) s, sb);
            else if (s is VectorConstant)
-                retstr += GenerateVectorConstant((VectorConstant) s);
+                GenerateVectorConstant((VectorConstant) s, sb);
            else if (s is RotationConstant)
-                retstr += GenerateRotationConstant((RotationConstant) s);
+                GenerateRotationConstant((RotationConstant) s, sb);
            else if (s is ListConstant)
-                retstr += GenerateListConstant((ListConstant) s);
+                GenerateListConstant((ListConstant) s, sb);
            else if (s is Constant)
-                retstr += GenerateConstant((Constant) s);
+                GenerateConstant((Constant) s, sb);
            else if (s is IdentDotExpression)
-                retstr += Generate(CheckName(((IdentDotExpression) s).Name) + "." + ((IdentDotExpression) s).Member, s);
+                Generate(CheckName(((IdentDotExpression) s).Name) + "." + ((IdentDotExpression) s).Member, s, sb);
            else if (s is IdentExpression)
-                retstr += GenerateIdentifier(((IdentExpression) s).Name, s);
+                GenerateIdentifier(((IdentExpression) s).Name, s, sb);
            else if (s is IDENT)
-                retstr += Generate(CheckName(((TOKEN) s).yytext), s);
+                Generate(CheckName(((TOKEN) s).yytext), s, sb);
            else
            {
                foreach (SYMBOL kid in s.kids)
-                    retstr += GenerateNode(s, kid);
+                    GenerateNodeToSB(s, kid,sb);
            }
-            return retstr;
+            return;
        }
        /// <summary>
@@ -285,10 +303,8 @@ namespace OpenSim.Region.ScriptEngine.Shared.CodeTools
        /// </summary>
        /// <param name="gf">The GlobalFunctionDefinition node.</param>
        /// <returns>String containing C# code for GlobalFunctionDefinition gf.</returns>
-        private string GenerateGlobalFunctionDefinition(GlobalFunctionDefinition gf)
+        private void GenerateGlobalFunctionDefinition(GlobalFunctionDefinition gf, StringBuilder sb)
        {
-            string retstr = String.Empty;
            // we need to separate the argument declaration list from other kids
            List<SYMBOL> argumentDeclarationListKids = new List<SYMBOL>();
            List<SYMBOL> remainingKids = new List<SYMBOL>();
@@ -299,18 +315,16 @@ namespace OpenSim.Region.ScriptEngine.Shared.CodeTools
                else
                    remainingKids.Add(kid);
-            retstr += GenerateIndented(String.Format("{0} {1}(", gf.ReturnType, CheckName(gf.Name)), gf);
+            GenerateIndented(String.Format("{0} {1}(", gf.ReturnType, CheckName(gf.Name)), gf, sb);
            // print the state arguments, if any
            foreach (SYMBOL kid in argumentDeclarationListKids)
-                retstr += GenerateArgumentDeclarationList((ArgumentDeclarationList) kid);
+                GenerateArgumentDeclarationList((ArgumentDeclarationList) kid, sb);
-            retstr += GenerateLine(")");
+            GenerateLine(")", sb);
            foreach (SYMBOL kid in remainingKids)
-                retstr += GenerateNode(gf, kid);
+                GenerateNodeToSB(gf, kid,sb);
-            return retstr;
        }
        /// <summary>
@@ -318,18 +332,14 @@ namespace OpenSim.Region.ScriptEngine.Shared.CodeTools
        /// </summary>
        /// <param name="gv">The GlobalVariableDeclaration node.</param>
        /// <returns>String containing C# code for GlobalVariableDeclaration gv.</returns>
-        private string GenerateGlobalVariableDeclaration(GlobalVariableDeclaration gv)
+        private void GenerateGlobalVariableDeclaration(GlobalVariableDeclaration gv, StringBuilder sb)
        {
-            string retstr = String.Empty;
            foreach (SYMBOL s in gv.kids)
            {
-                retstr += Indent();
+                Indent(sb);
-                retstr += GenerateNode(gv, s);
+                GenerateNodeToSB(gv, s ,sb);
-                retstr += GenerateLine(";");
+                GenerateLine(";", sb);
            }
-            return retstr;
        }
        /// <summary>
@@ -337,15 +347,11 @@ namespace OpenSim.Region.ScriptEngine.Shared.CodeTools
        /// </summary>
        /// <param name="s">The State node.</param>
        /// <returns>String containing C# code for State s.</returns>
-        private string GenerateState(State s)
+        private void GenerateState(State s, StringBuilder sb)
        {
-            string retstr = String.Empty;
            foreach (SYMBOL kid in s.kids)
                if (kid is StateEvent)
-                    retstr += GenerateStateEvent((StateEvent) kid, s.Name);
+                    GenerateStateEvent((StateEvent) kid, s.Name, sb);
-            return retstr;
        }
        /// <summary>
@@ -354,10 +360,8 @@ namespace OpenSim.Region.ScriptEngine.Shared.CodeTools
        /// <param name="se">The StateEvent node.</param>
        /// <param name="parentStateName">The name of the parent state.</param>
        /// <returns>String containing C# code for StateEvent se.</returns>
-        private string GenerateStateEvent(StateEvent se, string parentStateName)
+        private void GenerateStateEvent(StateEvent se, string parentStateName, StringBuilder sb)
        {
-            string retstr = String.Empty;
            // we need to separate the argument declaration list from other kids
            List<SYMBOL> argumentDeclarationListKids = new List<SYMBOL>();
            List<SYMBOL> remainingKids = new List<SYMBOL>();
@@ -369,18 +373,16 @@ namespace OpenSim.Region.ScriptEngine.Shared.CodeTools
                    remainingKids.Add(kid);
            // "state" (function) declaration
-            retstr += GenerateIndented(String.Format("public void {0}_event_{1}(", parentStateName, se.Name), se);
+            GenerateIndented(String.Format("public void {0}_event_{1}(", parentStateName, se.Name), se , sb);
            // print the state arguments, if any
            foreach (SYMBOL kid in argumentDeclarationListKids)
-                retstr += GenerateArgumentDeclarationList((ArgumentDeclarationList) kid);
+                GenerateArgumentDeclarationList((ArgumentDeclarationList) kid, sb);
-            retstr += GenerateLine(")");
+            GenerateLine(")", sb);
            foreach (SYMBOL kid in remainingKids)
-                retstr += GenerateNode(se, kid);
+                GenerateNodeToSB(se, kid, sb);
-            return retstr;
        }
        /// <summary>
@@ -388,20 +390,16 @@ namespace OpenSim.Region.ScriptEngine.Shared.CodeTools
        /// </summary>
        /// <param name="adl">The ArgumentDeclarationList node.</param>
        /// <returns>String containing C# code for ArgumentDeclarationList adl.</returns>
-        private string GenerateArgumentDeclarationList(ArgumentDeclarationList adl)
+        private void GenerateArgumentDeclarationList(ArgumentDeclarationList adl, StringBuilder sb)
        {
-            string retstr = String.Empty;
            int comma = adl.kids.Count - 1; // tells us whether to print a comma
            foreach (Declaration d in adl.kids)
            {
-                retstr += Generate(String.Format("{0} {1}", d.Datatype, CheckName(d.Id)), d);
+                Generate(String.Format("{0} {1}", d.Datatype, CheckName(d.Id)), d, sb);
                if (0 < comma--)
-                    retstr += Generate(", ");
+                    Generate(", ", sb);
            }
-            return retstr;
        }
        /// <summary>
@@ -409,20 +407,16 @@ namespace OpenSim.Region.ScriptEngine.Shared.CodeTools
        /// </summary>
        /// <param name="al">The ArgumentList node.</param>
        /// <returns>String containing C# code for ArgumentList al.</returns>
-        private string GenerateArgumentList(ArgumentList al)
+        private void GenerateArgumentList(ArgumentList al, StringBuilder sb)
        {
-            string retstr = String.Empty;
            int comma = al.kids.Count - 1;  // tells us whether to print a comma
            foreach (SYMBOL s in al.kids)
            {
-                retstr += GenerateNode(al, s);
+                GenerateNodeToSB(al, s, sb);
                if (0 < comma--)
-                    retstr += Generate(", ");
+                    Generate(", ", sb);
            }
-            return retstr;
        }
        /// <summary>
@@ -430,12 +424,10 @@ namespace OpenSim.Region.ScriptEngine.Shared.CodeTools
        /// </summary>
        /// <param name="cs">The CompoundStatement node.</param>
        /// <returns>String containing C# code for CompoundStatement cs.</returns>
-        private string GenerateCompoundStatement(SYMBOL previousSymbol, CompoundStatement cs)
+        private void GenerateCompoundStatement(SYMBOL previousSymbol, CompoundStatement cs, StringBuilder sb)
        {
-            string retstr = String.Empty;
            // opening brace
-            retstr += GenerateIndentedLine("{");
+            GenerateIndentedLine("{", sb);
            m_braceCount++;
            if (m_insertCoopTerminationChecks)
@@ -446,17 +438,15 @@ namespace OpenSim.Region.ScriptEngine.Shared.CodeTools
                    || previousSymbol is DoWhileStatement 
                    || previousSymbol is ForLoop
                    || previousSymbol is StateEvent)
-                retstr += GenerateIndentedLine(m_coopTerminationCheck);
+                GenerateIndentedLine(m_coopTerminationCheck, sb);
            }
            foreach (SYMBOL kid in cs.kids)
-                retstr += GenerateNode(cs, kid);
+                GenerateNodeToSB(cs, kid, sb);
            // closing brace
            m_braceCount--;
-            retstr += GenerateIndentedLine("}");
+            GenerateIndentedLine("}", sb);
-            return retstr;
        }
        /// <summary>
@@ -464,9 +454,9 @@ namespace OpenSim.Region.ScriptEngine.Shared.CodeTools
        /// </summary>
        /// <param name="d">The Declaration node.</param>
        /// <returns>String containing C# code for Declaration d.</returns>
-        private string GenerateDeclaration(Declaration d)
+        private void GenerateDeclaration(Declaration d, StringBuilder sb)
        {
-            return Generate(String.Format("{0} {1}", d.Datatype, CheckName(d.Id)), d);
+            Generate(String.Format("{0} {1}", d.Datatype, CheckName(d.Id)), d, sb);
        }
        /// <summary>
@@ -474,7 +464,7 @@ namespace OpenSim.Region.ScriptEngine.Shared.CodeTools
        /// </summary>
        /// <param name="s">The Statement node.</param>
        /// <returns>String containing C# code for Statement s.</returns>
-        private string GenerateStatement(SYMBOL previousSymbol, Statement s)
+        private void GenerateStatement(SYMBOL previousSymbol, Statement s, StringBuilder sb)
        {
            string retstr = String.Empty;
            bool printSemicolon = true;
@@ -491,13 +481,13 @@ namespace OpenSim.Region.ScriptEngine.Shared.CodeTools
                    transformToBlock = true;
                    // FIXME: This will be wrongly indented because the previous for/while/dowhile will have already indented.
-                    retstr += GenerateIndentedLine("{");
+                    GenerateIndentedLine("{", sb);
-                    retstr += GenerateIndentedLine(m_coopTerminationCheck);
+                    GenerateIndentedLine(m_coopTerminationCheck, sb);
                }
            }
-            retstr += Indent();
+            Indent(sb);
            if (0 < s.kids.Count)
            {
@@ -508,19 +498,17 @@ namespace OpenSim.Region.ScriptEngine.Shared.CodeTools
                // (MONO) error.
                if (!(s.kids.Top is IdentExpression && 1 == s.kids.Count))
                    foreach (SYMBOL kid in s.kids)
-                        retstr += GenerateNode(s, kid);
+                        GenerateNodeToSB(s, kid, sb);
            }
            if (printSemicolon)
-                retstr += GenerateLine(";");
+                GenerateLine(";", sb);
            if (transformToBlock)
            {
                // FIXME: This will be wrongly indented because the for/while/dowhile is currently handling the unindent
-                retstr += GenerateIndentedLine("}");
+                GenerateIndentedLine("}", sb);
            }
-            return retstr;
        }
        /// <summary>
@@ -528,19 +516,15 @@ namespace OpenSim.Region.ScriptEngine.Shared.CodeTools
        /// </summary>
        /// <param name="a">The Assignment node.</param>
        /// <returns>String containing C# code for Assignment a.</returns>
-        private string GenerateAssignment(Assignment a)
+        private void GenerateAssignment(Assignment a, StringBuilder sb)
        {
-            string retstr = String.Empty;
            List<string> identifiers = new List<string>();
            checkForMultipleAssignments(identifiers, a);
-            retstr += GenerateNode(a, (SYMBOL) a.kids.Pop());
+            GenerateNodeToSB(a, (SYMBOL) a.kids.Pop(), sb);
-            retstr += Generate(String.Format(" {0} ", a.AssignmentType), a);
+            Generate(String.Format(" {0} ", a.AssignmentType), a, sb);
            foreach (SYMBOL kid in a.kids)
-                retstr += GenerateNode(a, kid);
+                GenerateNodeToSB(a, kid, sb);
-            return retstr;
        }
        // This code checks for LSL of the following forms, and generates a
@@ -604,16 +588,12 @@ namespace OpenSim.Region.ScriptEngine.Shared.CodeTools
        /// </summary>
        /// <param name="rs">The ReturnStatement node.</param>
        /// <returns>String containing C# code for ReturnStatement rs.</returns>
-        private string GenerateReturnStatement(ReturnStatement rs)
+        private void GenerateReturnStatement(ReturnStatement rs, StringBuilder sb)
        {
-            string retstr = String.Empty;
+            Generate("return ", rs, sb);
-            retstr += Generate("return ", rs);
            foreach (SYMBOL kid in rs.kids)
-                retstr += GenerateNode(rs, kid);
+                GenerateNodeToSB(rs, kid, sb);
-            return retstr;
        }
        /// <summary>
@@ -621,7 +601,7 @@ namespace OpenSim.Region.ScriptEngine.Shared.CodeTools
        /// </summary>
        /// <param name="jl">The JumpLabel node.</param>
        /// <returns>String containing C# code for JumpLabel jl.</returns>
-        private string GenerateJumpLabel(JumpLabel jl)
+        private void GenerateJumpLabel(JumpLabel jl, StringBuilder sb)
        {
            string labelStatement;
@@ -630,7 +610,7 @@ namespace OpenSim.Region.ScriptEngine.Shared.CodeTools
            else
                labelStatement = "NoOp();";
-            return GenerateLine(String.Format("{0}: {1}", CheckName(jl.LabelName), labelStatement), jl);
+            GenerateLine(String.Format("{0}: {1}", CheckName(jl.LabelName), labelStatement), jl, sb);
        }
        /// <summary>
@@ -638,9 +618,9 @@ namespace OpenSim.Region.ScriptEngine.Shared.CodeTools
        /// </summary>
        /// <param name="js">The JumpStatement node.</param>
        /// <returns>String containing C# code for JumpStatement js.</returns>
-        private string GenerateJumpStatement(JumpStatement js)
+        private void GenerateJumpStatement(JumpStatement js, StringBuilder sb)
        {
-            return Generate(String.Format("goto {0}", CheckName(js.TargetName)), js);
+            Generate(String.Format("goto {0}", CheckName(js.TargetName)), js, sb);
        }
        /// <summary>
@@ -648,32 +628,28 @@ namespace OpenSim.Region.ScriptEngine.Shared.CodeTools
        /// </summary>
        /// <param name="ifs">The IfStatement node.</param>
        /// <returns>String containing C# code for IfStatement ifs.</returns>
-        private string GenerateIfStatement(IfStatement ifs)
+        private void GenerateIfStatement(IfStatement ifs, StringBuilder sb)
        {
-            string retstr = String.Empty;
+            GenerateIndented("if (", ifs, sb);
+            GenerateNodeToSB(ifs, (SYMBOL) ifs.kids.Pop(), sb);
-            retstr += GenerateIndented("if (", ifs);
+            GenerateLine(")", sb);
-            retstr += GenerateNode(ifs, (SYMBOL) ifs.kids.Pop());
-            retstr += GenerateLine(")");
            // CompoundStatement handles indentation itself but we need to do it
            // otherwise.
            bool indentHere = ifs.kids.Top is Statement;
            if (indentHere) m_braceCount++;
-            retstr += GenerateNode(ifs, (SYMBOL) ifs.kids.Pop());
+            GenerateNodeToSB(ifs, (SYMBOL) ifs.kids.Pop(), sb);
            if (indentHere) m_braceCount--;
            if (0 < ifs.kids.Count) // do it again for an else
            {
-                retstr += GenerateIndentedLine("else", ifs);
+                GenerateIndentedLine("else", ifs, sb);
                indentHere = ifs.kids.Top is Statement;
                if (indentHere) m_braceCount++;
-                retstr += GenerateNode(ifs, (SYMBOL) ifs.kids.Pop());
+                GenerateNodeToSB(ifs, (SYMBOL) ifs.kids.Pop(), sb);
                if (indentHere) m_braceCount--;
            }
-            return retstr;
        }
        /// <summary>
@@ -681,9 +657,9 @@ namespace OpenSim.Region.ScriptEngine.Shared.CodeTools
        /// </summary>
        /// <param name="sc">The StateChange node.</param>
        /// <returns>String containing C# code for StateChange sc.</returns>
-        private string GenerateStateChange(StateChange sc)
+        private void GenerateStateChange(StateChange sc, StringBuilder sb)
        {
-            return Generate(String.Format("state(\"{0}\")", sc.NewState), sc);
+            Generate(String.Format("state(\"{0}\")", sc.NewState), sc, sb);
        }
        /// <summary>
@@ -691,22 +667,18 @@ namespace OpenSim.Region.ScriptEngine.Shared.CodeTools
        /// </summary>
        /// <param name="ws">The WhileStatement node.</param>
        /// <returns>String containing C# code for WhileStatement ws.</returns>
-        private string GenerateWhileStatement(WhileStatement ws)
+        private void GenerateWhileStatement(WhileStatement ws, StringBuilder sb)
        {
-            string retstr = String.Empty;
+            GenerateIndented("while (", ws, sb);
+            GenerateNodeToSB(ws, (SYMBOL) ws.kids.Pop(), sb);
-            retstr += GenerateIndented("while (", ws);
+            GenerateLine(")", sb);
-            retstr += GenerateNode(ws, (SYMBOL) ws.kids.Pop());
-            retstr += GenerateLine(")");
            // CompoundStatement handles indentation itself but we need to do it
            // otherwise.
            bool indentHere = ws.kids.Top is Statement;
            if (indentHere) m_braceCount++;
-            retstr += GenerateNode(ws, (SYMBOL) ws.kids.Pop());
+            GenerateNodeToSB(ws, (SYMBOL) ws.kids.Pop(), sb);
            if (indentHere) m_braceCount--;
-            return retstr;
        }
        /// <summary>
@@ -714,24 +686,20 @@ namespace OpenSim.Region.ScriptEngine.Shared.CodeTools
        /// </summary>
        /// <param name="dws">The DoWhileStatement node.</param>
        /// <returns>String containing C# code for DoWhileStatement dws.</returns>
-        private string GenerateDoWhileStatement(DoWhileStatement dws)
+        private void GenerateDoWhileStatement(DoWhileStatement dws, StringBuilder sb)
        {
-            string retstr = String.Empty;
+            GenerateIndentedLine("do", dws, sb);
-            retstr += GenerateIndentedLine("do", dws);
            // CompoundStatement handles indentation itself but we need to do it
            // otherwise.
            bool indentHere = dws.kids.Top is Statement;
            if (indentHere) m_braceCount++;
-            retstr += GenerateNode(dws, (SYMBOL) dws.kids.Pop());
+            GenerateNodeToSB(dws, (SYMBOL) dws.kids.Pop(), sb);
            if (indentHere) m_braceCount--;
-            retstr += GenerateIndented("while (", dws);
+            GenerateIndented("while (", dws ,sb);
-            retstr += GenerateNode(dws, (SYMBOL) dws.kids.Pop());
+            GenerateNodeToSB(dws, (SYMBOL) dws.kids.Pop(), sb);
-            retstr += GenerateLine(");");
+            GenerateLine(");", sb);
-            return retstr;
        }
        /// <summary>
@@ -739,11 +707,9 @@ namespace OpenSim.Region.ScriptEngine.Shared.CodeTools
        /// </summary>
        /// <param name="fl">The ForLoop node.</param>
        /// <returns>String containing C# code for ForLoop fl.</returns>
-        private string GenerateForLoop(ForLoop fl)
+        private void GenerateForLoop(ForLoop fl, StringBuilder sb)
        {
-            string retstr = String.Empty;
+            GenerateIndented("for (", fl, sb);
-            retstr += GenerateIndented("for (", fl);
            // It's possible that we don't have an assignment, in which case
            // the child will be null and we only print the semicolon.
@@ -752,26 +718,24 @@ namespace OpenSim.Region.ScriptEngine.Shared.CodeTools
            ForLoopStatement s = (ForLoopStatement) fl.kids.Pop();
            if (null != s)
            {
-                retstr += GenerateForLoopStatement(s);
+                GenerateForLoopStatement(s, sb);
            }
-            retstr += Generate("; ");
+            Generate("; ", sb);
            // for (x = 0; x < 10; x++)
            //             ^^^^^^
-            retstr += GenerateNode(fl, (SYMBOL) fl.kids.Pop());
+            GenerateNodeToSB(fl, (SYMBOL) fl.kids.Pop(), sb);
-            retstr += Generate("; ");
+            Generate("; ", sb);
            // for (x = 0; x < 10; x++)
            //                     ^^^
-            retstr += GenerateForLoopStatement((ForLoopStatement) fl.kids.Pop());
+            GenerateForLoopStatement((ForLoopStatement) fl.kids.Pop(), sb);
-            retstr += GenerateLine(")");
+            GenerateLine(")", sb);
            // CompoundStatement handles indentation itself but we need to do it
            // otherwise.
            bool indentHere = fl.kids.Top is Statement;
            if (indentHere) m_braceCount++;
-            retstr += GenerateNode(fl, (SYMBOL) fl.kids.Pop());
+            GenerateNodeToSB(fl, (SYMBOL) fl.kids.Pop(), sb);
            if (indentHere) m_braceCount--;
-            return retstr;
        }
        /// <summary>
@@ -779,10 +743,8 @@ namespace OpenSim.Region.ScriptEngine.Shared.CodeTools
        /// </summary>
        /// <param name="fls">The ForLoopStatement node.</param>
        /// <returns>String containing C# code for ForLoopStatement fls.</returns>
-        private string GenerateForLoopStatement(ForLoopStatement fls)
+        private void GenerateForLoopStatement(ForLoopStatement fls, StringBuilder sb)
        {
-            string retstr = String.Empty;
            int comma = fls.kids.Count - 1;  // tells us whether to print a comma
            // It's possible that all we have is an empty Ident, for example:
@@ -791,7 +753,7 @@ namespace OpenSim.Region.ScriptEngine.Shared.CodeTools
            //
            // Which is illegal in C# (MONO). We'll skip it.
            if (fls.kids.Top is IdentExpression && 1 == fls.kids.Count)
-                return retstr;
+                return;
            for (int i = 0; i < fls.kids.Count; i++)
            {
@@ -813,12 +775,10 @@ namespace OpenSim.Region.ScriptEngine.Shared.CodeTools
                while (s is ParenthesisExpression)
                    s = (SYMBOL)s.kids.Pop();
                    
-                retstr += GenerateNode(fls, s);
+                GenerateNodeToSB(fls, s, sb);
                if (0 < comma--)
-                    retstr += Generate(", ");
+                    Generate(", ", sb);
            }
-            return retstr;
        }
        /// <summary>
@@ -826,31 +786,27 @@ namespace OpenSim.Region.ScriptEngine.Shared.CodeTools
        /// </summary>
        /// <param name="be">The BinaryExpression node.</param>
        /// <returns>String containing C# code for BinaryExpression be.</returns>
-        private string GenerateBinaryExpression(BinaryExpression be)
+        private void GenerateBinaryExpression(BinaryExpression be, StringBuilder sb)
        {
-            string retstr = String.Empty;
            if (be.ExpressionSymbol.Equals("&&") || be.ExpressionSymbol.Equals("||"))
            {
                // special case handling for logical and/or, see Mantis 3174
-                retstr += "((bool)(";
+                sb.Append("((bool)(");
-                retstr += GenerateNode(be, (SYMBOL)be.kids.Pop());
+                GenerateNodeToSB(be, (SYMBOL)be.kids.Pop(), sb);
-                retstr += "))";
+                sb.Append("))");
-                retstr += Generate(String.Format(" {0} ", be.ExpressionSymbol.Substring(0,1)), be);
+                Generate(String.Format(" {0} ", be.ExpressionSymbol.Substring(0,1)), be, sb);
-                retstr += "((bool)(";
+                sb.Append("((bool)(");
                foreach (SYMBOL kid in be.kids)
-                    retstr += GenerateNode(be, kid);
+                    GenerateNodeToSB(be, kid, sb);
-                retstr += "))";
+                sb.Append("))");
            }
            else
            {
-                retstr += GenerateNode(be, (SYMBOL)be.kids.Pop());
+                GenerateNodeToSB(be, (SYMBOL)be.kids.Pop(), sb);
-                retstr += Generate(String.Format(" {0} ", be.ExpressionSymbol), be);
+                Generate(String.Format(" {0} ", be.ExpressionSymbol), be, sb);
                foreach (SYMBOL kid in be.kids)
-                    retstr += GenerateNode(be, kid);
+                    GenerateNodeToSB(be, kid, sb);
            }
-            return retstr;
        }
        /// <summary>
@@ -858,14 +814,10 @@ namespace OpenSim.Region.ScriptEngine.Shared.CodeTools
        /// </summary>
        /// <param name="ue">The UnaryExpression node.</param>
        /// <returns>String containing C# code for UnaryExpression ue.</returns>
-        private string GenerateUnaryExpression(UnaryExpression ue)
+        private void GenerateUnaryExpression(UnaryExpression ue, StringBuilder sb)
        {
-            string retstr = String.Empty;
+            Generate(ue.UnarySymbol, ue, sb);
+            GenerateNodeToSB(ue, (SYMBOL) ue.kids.Pop(), sb);
-            retstr += Generate(ue.UnarySymbol, ue);
-            retstr += GenerateNode(ue, (SYMBOL) ue.kids.Pop());
-            return retstr;
        }
        /// <summary>
@@ -873,16 +825,14 @@ namespace OpenSim.Region.ScriptEngine.Shared.CodeTools
        /// </summary>
        /// <param name="pe">The ParenthesisExpression node.</param>
        /// <returns>String containing C# code for ParenthesisExpression pe.</returns>
-        private string GenerateParenthesisExpression(ParenthesisExpression pe)
+        private void GenerateParenthesisExpression(ParenthesisExpression pe, StringBuilder sb)
        {
            string retstr = String.Empty;
-            retstr += Generate("(");
+            Generate("(", sb);
            foreach (SYMBOL kid in pe.kids)
-                retstr += GenerateNode(pe, kid);
+                GenerateNodeToSB(pe, kid, sb);
-            retstr += Generate(")");
+            Generate(")", sb);
-            return retstr;
        }
        /// <summary>
@@ -890,19 +840,15 @@ namespace OpenSim.Region.ScriptEngine.Shared.CodeTools
        /// </summary>
        /// <param name="ide">The IncrementDecrementExpression node.</param>
        /// <returns>String containing C# code for IncrementDecrementExpression ide.</returns>
-        private string GenerateIncrementDecrementExpression(IncrementDecrementExpression ide)
+        private void GenerateIncrementDecrementExpression(IncrementDecrementExpression ide, StringBuilder sb)
        {
-            string retstr = String.Empty;
            if (0 < ide.kids.Count)
            {
                IdentDotExpression dot = (IdentDotExpression) ide.kids.Top;
-                retstr += Generate(String.Format("{0}", ide.PostOperation ? CheckName(dot.Name) + "." + dot.Member + ide.Operation : ide.Operation + CheckName(dot.Name) + "." + dot.Member), ide);
+                Generate(String.Format("{0}", ide.PostOperation ? CheckName(dot.Name) + "." + dot.Member + ide.Operation : ide.Operation + CheckName(dot.Name) + "." + dot.Member), ide, sb);
            }
            else
-                retstr += Generate(String.Format("{0}", ide.PostOperation ? CheckName(ide.Name) + ide.Operation : ide.Operation + CheckName(ide.Name)), ide);
+                Generate(String.Format("{0}", ide.PostOperation ? CheckName(ide.Name) + ide.Operation : ide.Operation + CheckName(ide.Name)), ide, sb);
-            return retstr;
        }
        /// <summary>
@@ -910,16 +856,12 @@ namespace OpenSim.Region.ScriptEngine.Shared.CodeTools
        /// </summary>
        /// <param name="te">The TypecastExpression node.</param>
        /// <returns>String containing C# code for TypecastExpression te.</returns>
-        private string GenerateTypecastExpression(TypecastExpression te)
+        private void GenerateTypecastExpression(TypecastExpression te, StringBuilder sb)
        {
-            string retstr = String.Empty;
            // we wrap all typecasted statements in parentheses
-            retstr += Generate(String.Format("({0}) (", te.TypecastType), te);
+            Generate(String.Format("({0}) (", te.TypecastType), te, sb);
-            retstr += GenerateNode(te, (SYMBOL) te.kids.Pop());
+            GenerateNodeToSB(te, (SYMBOL) te.kids.Pop(), sb);
-            retstr += Generate(")");
+            Generate(")", sb);
-            return retstr;
        }
        /// <summary>
@@ -928,7 +870,7 @@ namespace OpenSim.Region.ScriptEngine.Shared.CodeTools
        /// <param name="id">The symbol name</param>
        /// <param name="s">The Symbol node.</param>
        /// <returns>String containing C# code for identifier reference.</returns>
-        private string GenerateIdentifier(string id, SYMBOL s)
+        private void GenerateIdentifier(string id, SYMBOL s, StringBuilder  sb)
        {
            if (m_comms != null)
            {
@@ -950,11 +892,13 @@ namespace OpenSim.Region.ScriptEngine.Shared.CodeTools
                        retval = String.Format("new LSL_Types.Quaternion(\"{0}\")",((OpenMetaverse.Quaternion)value).ToString());
                    else retval = id;
                    
-                    return Generate(retval, s);
+                    Generate(retval, s, sb);
+                    return; 
                }
            }
-            return Generate(CheckName(id), s);
+            Generate(CheckName(id), s, sb);
+            return;
        }
        /// <summary>
@@ -962,10 +906,8 @@ namespace OpenSim.Region.ScriptEngine.Shared.CodeTools
        /// </summary>
        /// <param name="fc">The FunctionCall node.</param>
        /// <returns>String containing C# code for FunctionCall fc.</returns>
-        private string GenerateFunctionCall(FunctionCall fc)
+        private void GenerateFunctionCall(FunctionCall fc, StringBuilder sb)
        {
-            string retstr = String.Empty;
            string modinvoke = null;
            if (m_comms != null)
                modinvoke = m_comms.LookupModInvocation(fc.Id);
@@ -975,22 +917,20 @@ namespace OpenSim.Region.ScriptEngine.Shared.CodeTools
                if (fc.kids[0] is ArgumentList)
                {
                    if ((fc.kids[0] as ArgumentList).kids.Count == 0)
-                        retstr += Generate(String.Format("{0}(\"{1}\"",modinvoke,fc.Id), fc);
+                        Generate(String.Format("{0}(\"{1}\"",modinvoke,fc.Id), fc, sb);
                    else
-                        retstr += Generate(String.Format("{0}(\"{1}\",",modinvoke,fc.Id), fc);
+                        Generate(String.Format("{0}(\"{1}\",",modinvoke,fc.Id), fc, sb);
                }
            }
            else
            {
-                retstr += Generate(String.Format("{0}(", CheckName(fc.Id)), fc);
+                Generate(String.Format("{0}(", CheckName(fc.Id)), fc, sb);
            }
            
            foreach (SYMBOL kid in fc.kids)
-                retstr += GenerateNode(fc, kid);
+                GenerateNodeToSB(fc, kid, sb);
-            retstr += Generate(")");
-            return retstr;
+            Generate(")", sb);
        }
        /// <summary>
@@ -998,10 +938,8 @@ namespace OpenSim.Region.ScriptEngine.Shared.CodeTools
        /// </summary>
        /// <param name="c">The Constant node.</param>
        /// <returns>String containing C# code for Constant c.</returns>
-        private string GenerateConstant(Constant c)
+        private void GenerateConstant(Constant c, StringBuilder sb)
        {
-            string retstr = String.Empty;
            // Supprt LSL's weird acceptance of floats with no trailing digits
            // after the period. Turn float x = 10.; into float x = 10.0;
            if ("LSL_Types.LSLFloat" == c.Type)
@@ -1020,9 +958,7 @@ namespace OpenSim.Region.ScriptEngine.Shared.CodeTools
                c.Value = "new LSL_Types.LSLString(\""+c.Value+"\")";
            }
-            retstr += Generate(c.Value, c);
+            Generate(c.Value, c, sb);
-            return retstr;
        }
        /// <summary>
@@ -1030,19 +966,15 @@ namespace OpenSim.Region.ScriptEngine.Shared.CodeTools
        /// </summary>
        /// <param name="vc">The VectorConstant node.</param>
        /// <returns>String containing C# code for VectorConstant vc.</returns>
-        private string GenerateVectorConstant(VectorConstant vc)
+        private void GenerateVectorConstant(VectorConstant vc, StringBuilder sb)
        {
-            string retstr = String.Empty;
+            Generate(String.Format("new {0}(", vc.Type), vc, sb);
+            GenerateNodeToSB(vc, (SYMBOL) vc.kids.Pop(), sb);
-            retstr += Generate(String.Format("new {0}(", vc.Type), vc);
+            Generate(", ", sb);
-            retstr += GenerateNode(vc, (SYMBOL) vc.kids.Pop());
+            GenerateNodeToSB(vc, (SYMBOL) vc.kids.Pop(), sb);
-            retstr += Generate(", ");
+            Generate(", ", sb);
-            retstr += GenerateNode(vc, (SYMBOL) vc.kids.Pop());
+            GenerateNodeToSB(vc, (SYMBOL) vc.kids.Pop(), sb);
-            retstr += Generate(", ");
+            Generate(")", sb);
-            retstr += GenerateNode(vc, (SYMBOL) vc.kids.Pop());
-            retstr += Generate(")");
-            return retstr;
        }
        /// <summary>
@@ -1050,21 +982,17 @@ namespace OpenSim.Region.ScriptEngine.Shared.CodeTools
        /// </summary>
        /// <param name="rc">The RotationConstant node.</param>
        /// <returns>String containing C# code for RotationConstant rc.</returns>
-        private string GenerateRotationConstant(RotationConstant rc)
+        private void GenerateRotationConstant(RotationConstant rc, StringBuilder sb)
        {
-            string retstr = String.Empty;
+            Generate(String.Format("new {0}(", rc.Type), rc, sb);
+            GenerateNodeToSB(rc, (SYMBOL) rc.kids.Pop(), sb);
-            retstr += Generate(String.Format("new {0}(", rc.Type), rc);
+            Generate(", ", sb);
-            retstr += GenerateNode(rc, (SYMBOL) rc.kids.Pop());
+            GenerateNodeToSB(rc, (SYMBOL) rc.kids.Pop(), sb);
-            retstr += Generate(", ");
+            Generate(", ", sb);
-            retstr += GenerateNode(rc, (SYMBOL) rc.kids.Pop());
+            GenerateNodeToSB(rc, (SYMBOL) rc.kids.Pop(), sb);
-            retstr += Generate(", ");
+            Generate(", ", sb);
-            retstr += GenerateNode(rc, (SYMBOL) rc.kids.Pop());
+            GenerateNodeToSB(rc, (SYMBOL) rc.kids.Pop(), sb);
-            retstr += Generate(", ");
+            Generate(")", sb);
-            retstr += GenerateNode(rc, (SYMBOL) rc.kids.Pop());
-            retstr += Generate(")");
-            return retstr;
        }
        /// <summary>
@@ -1072,27 +1000,25 @@ namespace OpenSim.Region.ScriptEngine.Shared.CodeTools
        /// </summary>
        /// <param name="lc">The ListConstant node.</param>
        /// <returns>String containing C# code for ListConstant lc.</returns>
-        private string GenerateListConstant(ListConstant lc)
+        private void GenerateListConstant(ListConstant lc, StringBuilder sb)
        {
-            string retstr = String.Empty;
+            Generate(String.Format("new {0}(", lc.Type), lc, sb);
-            retstr += Generate(String.Format("new {0}(", lc.Type), lc);
            foreach (SYMBOL kid in lc.kids)
-                retstr += GenerateNode(lc, kid);
+                GenerateNodeToSB(lc, kid, sb);
-            retstr += Generate(")");
+            Generate(")", sb);
-            return retstr;
        }
        /// <summary>
        /// Prints a newline.
        /// </summary>
        /// <returns>A newline.</returns>
-        private string GenerateLine()
+        private void GenerateLine(StringBuilder sb)
        {
-            return GenerateLine("");
+            sb.Append("\n");
+            m_CSharpLine++;
+            m_CSharpCol = 1;
        }
        /// <summary>
@@ -1100,9 +1026,12 @@ namespace OpenSim.Region.ScriptEngine.Shared.CodeTools
        /// </summary>
        /// <param name="s">String of text to print.</param>
        /// <returns>String s followed by newline.</returns>
-        private string GenerateLine(string s)
+        private void GenerateLine(string s, StringBuilder sb)
        {
-            return GenerateLine(s, null);
+            sb.Append(s);
+            sb.Append("\n");
+            m_CSharpLine++;
+            m_CSharpCol = 1;
        }
        /// <summary>
@@ -1112,14 +1041,13 @@ namespace OpenSim.Region.ScriptEngine.Shared.CodeTools
        /// <param name="sym">Symbol being generated to extract original line
        /// number and column from.</param>
        /// <returns>String s followed by newline.</returns>
-        private string GenerateLine(string s, SYMBOL sym)
+        private void GenerateLine(string s, SYMBOL sym, StringBuilder sb)
        {
-            string retstr = Generate(s, sym) + "\n";
+            Generate(s, sym, sb);
+            sb.Append("\n");
            m_CSharpLine++;
            m_CSharpCol = 1;
-            return retstr;
        }
        /// <summary>
@@ -1127,9 +1055,10 @@ namespace OpenSim.Region.ScriptEngine.Shared.CodeTools
        /// </summary>
        /// <param name="s">String of text to print.</param>
        /// <returns>String s.</returns>
-        private string Generate(string s)
+        private void Generate(string s, StringBuilder sb)
        {
-            return Generate(s, null);
+            sb.Append(s);
+            m_CSharpCol += s.Length;
        }
        /// <summary>
@@ -1139,14 +1068,13 @@ namespace OpenSim.Region.ScriptEngine.Shared.CodeTools
        /// <param name="sym">Symbol being generated to extract original line
        /// number and column from.</param>
        /// <returns>String s.</returns>
-        private string Generate(string s, SYMBOL sym)
+        private void Generate(string s, SYMBOL sym, StringBuilder sb)
        {
+            sb.Append(s);
            if (null != sym)
                m_positionMap.Add(new KeyValuePair<int, int>(m_CSharpLine, m_CSharpCol), new KeyValuePair<int, int>(sym.Line, sym.Position));
            m_CSharpCol += s.Length;
-            return s;
        }
        /// <summary>
@@ -1154,9 +1082,9 @@ namespace OpenSim.Region.ScriptEngine.Shared.CodeTools
        /// </summary>
        /// <param name="s">String of text to print.</param>
        /// <returns>Properly indented string s followed by newline.</returns>
-        private string GenerateIndentedLine(string s)
+        private void GenerateIndentedLine(string s, StringBuilder sb)
        {
-            return GenerateIndentedLine(s, null);
+            GenerateIndentedLine(s, null, sb);
        }
        /// <summary>
@@ -1166,14 +1094,12 @@ namespace OpenSim.Region.ScriptEngine.Shared.CodeTools
        /// <param name="sym">Symbol being generated to extract original line
        /// number and column from.</param>
        /// <returns>Properly indented string s followed by newline.</returns>
-        private string GenerateIndentedLine(string s, SYMBOL sym)
+        private void GenerateIndentedLine(string s, SYMBOL sym, StringBuilder sb)
        {
-            string retstr = GenerateIndented(s, sym) + "\n";
+            GenerateIndented(s, sym , sb );
+            sb.Append("\n");
            m_CSharpLine++;
            m_CSharpCol = 1;
-            return retstr;
        }
        /// <summary>
@@ -1194,34 +1120,28 @@ namespace OpenSim.Region.ScriptEngine.Shared.CodeTools
        /// <param name="sym">Symbol being generated to extract original line
        /// number and column from.</param>
        /// <returns>Properly indented string s.</returns>
-        private string GenerateIndented(string s, SYMBOL sym)
+        private void GenerateIndented(string s, SYMBOL sym, StringBuilder sb)
        {
-            string retstr = Indent() + s;
+            Indent(sb);
+            sb.Append(s);
+            
            if (null != sym)
                m_positionMap.Add(new KeyValuePair<int, int>(m_CSharpLine, m_CSharpCol), new KeyValuePair<int, int>(sym.Line, sym.Position));
            m_CSharpCol += s.Length;
-            return retstr;
        }
        /// <summary>
        /// Prints correct indentation.
        /// </summary>
        /// <returns>Indentation based on brace count.</returns>
-        private string Indent()
+        private void Indent(StringBuilder sb)
        {
-            string retstr = String.Empty;
            for (int i = 0; i < m_braceCount; i++)
-                for (int j = 0; j < m_indentWidth; j++)
+            {
-                {
+                sb.Append("    ");
-                     retstr += " ";
+                m_CSharpCol += 4;
-                     m_CSharpCol++;
+            }
-                }
-            return retstr;
        }
        /// <summary>
diff --git a/OpenSim/Region/ScriptEngine/Shared/CodeTools/Compiler.cs b/OpenSim/Region/ScriptEngine/Shared/CodeTools/Compiler.cs
index af324bf..f632cb0 100644
--- a/OpenSim/Region/ScriptEngine/Shared/CodeTools/Compiler.cs
+++ b/OpenSim/Region/ScriptEngine/Shared/CodeTools/Compiler.cs
@@ -81,8 +81,8 @@ namespace OpenSim.Region.ScriptEngine.Shared.CodeTools
        // private object m_syncy = new object();
-        private static CSharpCodeProvider CScodeProvider = new CSharpCodeProvider();
+//        private static CSharpCodeProvider CScodeProvider = new CSharpCodeProvider();
-        private static VBCodeProvider VBcodeProvider = new VBCodeProvider();
+//        private static VBCodeProvider VBcodeProvider = new VBCodeProvider();
        // private static int instanceID = new Random().Next(0, int.MaxValue);                 // Unique number to use on our compiled files
        private static UInt64 scriptCompileCounter = 0;                                     // And a counter
@@ -356,14 +356,24 @@ namespace OpenSim.Region.ScriptEngine.Shared.CodeTools
                throw new Exception(errtext);
            }
-            string compileScript = source;
+            string compileScript = string.Empty;
            if (language == enumCompileType.lsl)
            {
                // Its LSL, convert it to C#
+                StringBuilder sb = new StringBuilder(16394);
                LSL_Converter = (ICodeConverter)new CSCodeGenerator(comms, m_insertCoopTerminationCalls);
-                compileScript = LSL_Converter.Convert(source);
+                AddCSScriptHeader(
+                        m_scriptEngine.ScriptClassName, 
+                        m_scriptEngine.ScriptBaseClassName, 
+                        m_scriptEngine.ScriptBaseClassParameters,
+                        sb);
+                LSL_Converter.Convert(source,sb);
+                AddCSScriptTail(sb);
+                compileScript = sb.ToString();
                // copy converter warnings into our warnings.
                foreach (string warning in LSL_Converter.GetWarnings())
                {
@@ -374,22 +384,24 @@ namespace OpenSim.Region.ScriptEngine.Shared.CodeTools
                // Write the linemap to a file and save it in our dictionary for next time. 
                m_lineMaps[assembly] = linemap;
                WriteMapFile(assembly + ".map", linemap);
+                LSL_Converter.Clear();
            }
+            else
-            switch (language)
+            {         
-            {
+                switch (language)
-                case enumCompileType.cs:
+                {
-                case enumCompileType.lsl:
+                    case enumCompileType.cs:
-                    compileScript = CreateCSCompilerScript(
+                        compileScript = CreateCSCompilerScript(
-                        compileScript, 
+                            compileScript, 
-                        m_scriptEngine.ScriptClassName, 
+                            m_scriptEngine.ScriptClassName, 
-                        m_scriptEngine.ScriptBaseClassName, 
+                            m_scriptEngine.ScriptBaseClassName, 
-                        m_scriptEngine.ScriptBaseClassParameters);
+                            m_scriptEngine.ScriptBaseClassParameters);
-                    break;
+                        break;
-                case enumCompileType.vb:
+                    case enumCompileType.vb:
-                    compileScript = CreateVBCompilerScript(
+                        compileScript = CreateVBCompilerScript(
-                        compileScript, m_scriptEngine.ScriptClassName, m_scriptEngine.ScriptBaseClassName);
+                            compileScript, m_scriptEngine.ScriptClassName, m_scriptEngine.ScriptBaseClassName);
-                    break;
+                        break;
+                }
            }
            assembly = CompileFromDotNetText(compileScript, language, asset, assembly);
@@ -419,6 +431,34 @@ namespace OpenSim.Region.ScriptEngine.Shared.CodeTools
 //            return compileScript;
 //        }
+        public static void AddCSScriptHeader(string className, string baseClassName, ParameterInfo[] constructorParameters, StringBuilder sb)
+        {
+            sb.Append(string.Format(
+@"using OpenSim.Region.ScriptEngine.Shared; 
+using System.Collections.Generic;
+namespace SecondLife 
+{{ 
+    public class {0} : {1} 
+    {{
+        public {0}({2}) : base({3}) {{}}
+",
+                className,
+                baseClassName, 
+                constructorParameters != null 
+                    ? string.Join(", ", Array.ConvertAll<ParameterInfo, string>(constructorParameters, pi => pi.ToString())) 
+                    : "", 
+                constructorParameters != null 
+                    ? string.Join(", ", Array.ConvertAll<ParameterInfo, string>(constructorParameters, pi => pi.Name)) 
+                    : ""
+               ));
+        }
+        public static void AddCSScriptTail(StringBuilder sb)
+        {
+            sb.Append(string.Format("    }}\n}}\n"));
+        }
        public static string CreateCSCompilerScript(
            string compileScript, string className, string baseClassName, ParameterInfo[] constructorParameters)
        {
@@ -511,8 +551,6 @@ namespace SecondLife
            // Do actual compile
            CompilerParameters parameters = new CompilerParameters();
-            parameters.IncludeDebugInformation = true;
            string rootPath = AppDomain.CurrentDomain.BaseDirectory;
            parameters.ReferencedAssemblies.Add(Path.Combine(rootPath,
@@ -532,26 +570,44 @@ namespace SecondLife
            parameters.IncludeDebugInformation = CompileWithDebugInformation;
            //parameters.WarningLevel = 1; // Should be 4?
            parameters.TreatWarningsAsErrors = false;
+            parameters.GenerateInMemory = false;
+  
            CompilerResults results;
+            CodeDomProvider provider;
            switch (lang)
            {
                case enumCompileType.vb:
-                    results = VBcodeProvider.CompileAssemblyFromSource(
+//                    results = VBcodeProvider.CompileAssemblyFromSource(
-                            parameters, Script);
+//                            parameters, Script);
+                    provider = CodeDomProvider.CreateProvider("VisualBasic");
                    break;
                case enumCompileType.cs:
                case enumCompileType.lsl:
+                    provider = CodeDomProvider.CreateProvider("CSharp");
+                    break;
+                default:
+                    throw new Exception("Compiler is not able to recongnize " +
+                                        "language type \"" + lang.ToString() + "\"");
+            }
+            if(provider == null)
+                    throw new Exception("Compiler failed to load ");
                    bool complete = false;
                    bool retried = false;
                    do
                    {
-                        lock (CScodeProvider)
+//                        lock (CScodeProvider)
-                        {
+//                        {
-                            results = CScodeProvider.CompileAssemblyFromSource(
+//                            results = CScodeProvider.CompileAssemblyFromSource(
+//                                parameters, Script);
+//                        }
+                        
+                        results = provider.CompileAssemblyFromSource(
                                parameters, Script);
-                        }
                        // Deal with an occasional segv in the compiler.
                        // Rarely, if ever, occurs twice in succession.
                        // Line # == 0 and no file name are indications that
@@ -575,11 +631,11 @@ namespace SecondLife
                            complete = true;
                        }
                    } while (!complete);
-                    break;
+//                    break;
-                default:
+//                default:
-                    throw new Exception("Compiler is not able to recongnize " +
+//                    throw new Exception("Compiler is not able to recongnize " +
-                                        "language type \"" + lang.ToString() + "\"");
+//                                        "language type \"" + lang.ToString() + "\"");
-            }
+//            }
 //            foreach (Type type in results.CompiledAssembly.GetTypes())
 //            {
@@ -628,6 +684,8 @@ namespace SecondLife
                }
            }
+            provider.Dispose();
+           
            if (hadErrors)
            {
                throw new Exception(errtext);
@@ -785,15 +843,16 @@ namespace SecondLife
        private static void WriteMapFile(string filename, Dictionary<KeyValuePair<int, int>, KeyValuePair<int, int>> linemap)
        {
-            string mapstring = String.Empty;
+            StringBuilder mapbuilder = new StringBuilder(1024);
            foreach (KeyValuePair<KeyValuePair<int, int>, KeyValuePair<int, int>> kvp in linemap)
            {
                KeyValuePair<int, int> k = kvp.Key;
                KeyValuePair<int, int> v = kvp.Value;
-                mapstring += String.Format("{0},{1},{2},{3}\n", k.Key, k.Value, v.Key, v.Value);
+                mapbuilder.Append(String.Format("{0},{1},{2},{3}\n", k.Key, k.Value, v.Key, v.Value));
            }
-            Byte[] mapbytes = Encoding.ASCII.GetBytes(mapstring);
+            Byte[] mapbytes = Encoding.ASCII.GetBytes(mapbuilder.ToString());
            using (FileStream mfs = File.Create(filename))
                mfs.Write(mapbytes, 0, mapbytes.Length);
diff --git a/OpenSim/Region/ScriptEngine/Shared/CodeTools/ICodeConverter.cs b/OpenSim/Region/ScriptEngine/Shared/CodeTools/ICodeConverter.cs
index 84e8ab2..076caad 100644
--- a/OpenSim/Region/ScriptEngine/Shared/CodeTools/ICodeConverter.cs
+++ b/OpenSim/Region/ScriptEngine/Shared/CodeTools/ICodeConverter.cs
@@ -27,12 +27,15 @@
 */
 using System;
+using System.Text;
 namespace OpenSim.Region.ScriptEngine.Shared.CodeTools
 {
    public interface ICodeConverter
    {
        string Convert(string script);
+        void Convert(string script, StringBuilder sb);
        string[] GetWarnings();
+        void Clear();
    }
 }
diff --git a/OpenSim/Region/ScriptEngine/Shared/CodeTools/LSL2CSCodeTransformer.cs b/OpenSim/Region/ScriptEngine/Shared/CodeTools/LSL2CSCodeTransformer.cs
index 0fb3574..0585f8b 100644
--- a/OpenSim/Region/ScriptEngine/Shared/CodeTools/LSL2CSCodeTransformer.cs
+++ b/OpenSim/Region/ScriptEngine/Shared/CodeTools/LSL2CSCodeTransformer.cs
@@ -191,7 +191,7 @@ namespace OpenSim.Region.ScriptEngine.Shared.CodeTools
                Constant rca = new Constant(p, "float", "0.0");
                Constant rcb = new Constant(p, "float", "0.0");
                Constant rcc = new Constant(p, "float", "0.0");
-                Constant rcd = new Constant(p, "float", "0.0");
+                Constant rcd = new Constant(p, "float", "1.0");
                ConstantExpression rcea = new ConstantExpression(p, rca);
                ConstantExpression rceb = new ConstantExpression(p, rcb);
                ConstantExpression rcec = new ConstantExpression(p, rcc);
diff --git a/OpenSim/Region/ScriptEngine/Shared/CodeTools/Tests/CSCodeGeneratorTest.cs b/OpenSim/Region/ScriptEngine/Shared/CodeTools/Tests/CSCodeGeneratorTest.cs
index b92f3a3..a9f3283 100644
--- a/OpenSim/Region/ScriptEngine/Shared/CodeTools/Tests/CSCodeGeneratorTest.cs
+++ b/OpenSim/Region/ScriptEngine/Shared/CodeTools/Tests/CSCodeGeneratorTest.cs
@@ -1388,7 +1388,7 @@ default
                "\n            LSL_Types.list m = new LSL_Types.list(new LSL_Types.LSLInteger(1), new LSL_Types.LSLInteger(2), new LSL_Types.LSLInteger(3));" +
                "\n            LSL_Types.Vector3 v = new LSL_Types.Vector3(new LSL_Types.LSLFloat(0.0), new LSL_Types.LSLFloat(0.0), new LSL_Types.LSLFloat(0.0));" +
                "\n            LSL_Types.Vector3 w = new LSL_Types.Vector3(new LSL_Types.LSLFloat(1.0), new LSL_Types.LSLFloat(0.1), new LSL_Types.LSLFloat(0.5));" +
-                "\n            LSL_Types.Quaternion r = new LSL_Types.Quaternion(new LSL_Types.LSLFloat(0.0), new LSL_Types.LSLFloat(0.0), new LSL_Types.LSLFloat(0.0), new LSL_Types.LSLFloat(0.0));" +
+                "\n            LSL_Types.Quaternion r = new LSL_Types.Quaternion(new LSL_Types.LSLFloat(0.0), new LSL_Types.LSLFloat(0.0), new LSL_Types.LSLFloat(0.0), new LSL_Types.LSLFloat(1.0));" +
                "\n            LSL_Types.Quaternion u = new LSL_Types.Quaternion(new LSL_Types.LSLFloat(0.8), new LSL_Types.LSLFloat(0.7), new LSL_Types.LSLFloat(0.6), llSomeFunc());" +
                "\n            LSL_Types.LSLString k = new LSL_Types.LSLString(\"\");" +
                "\n            LSL_Types.LSLString n = new LSL_Types.LSLString(\"ping\");" +
diff --git a/OpenSim/Region/ScriptEngine/Shared/CodeTools/Tests/CompilerTest.cs b/OpenSim/Region/ScriptEngine/Shared/CodeTools/Tests/CompilerTest.cs
index b476e32..ad4ccf0 100644
--- a/OpenSim/Region/ScriptEngine/Shared/CodeTools/Tests/CompilerTest.cs
+++ b/OpenSim/Region/ScriptEngine/Shared/CodeTools/Tests/CompilerTest.cs
@@ -37,6 +37,7 @@ using OpenSim.Tests.Common;
 namespace OpenSim.Region.ScriptEngine.Shared.CodeTools.Tests
 {
    /// <summary>
    /// Tests the LSL compiler. Among other things, test that error messages
    /// generated by the C# compiler can be mapped to prper lines/columns in
@@ -132,7 +133,8 @@ namespace OpenSim.Region.ScriptEngine.Shared.CodeTools.Tests
            return compilerResults;
        }
+/*  test too depedent on counting lines and columns maping code generation changes
+erros position is better tested on viewers
        /// <summary>
        /// Test that line number errors are resolved as expected when preceding code contains a jump.
        /// </summary>
@@ -159,6 +161,7 @@ namespace OpenSim.Region.ScriptEngine.Shared.CodeTools.Tests
                positionMap[new KeyValuePair<int, int>(compilerResults.Errors[0].Line, compilerResults.Errors[0].Column)]);
        }
        /// <summary>
        /// Test the C# compiler error message can be mapped to the correct
        /// line/column in the LSL source when an undeclared variable is used.
@@ -183,7 +186,7 @@ namespace OpenSim.Region.ScriptEngine.Shared.CodeTools.Tests
                new KeyValuePair<int, int>(5, 21),
                positionMap[new KeyValuePair<int, int>(compilerResults.Errors[0].Line, compilerResults.Errors[0].Column)]);
        }
+*/
        /// <summary>
        /// Test that a string can be cast to string and another string
        /// concatenated.
diff --git a/OpenSim/Region/ScriptEngine/Shared/Instance/ScriptInstance.cs b/OpenSim/Region/ScriptEngine/Shared/Instance/ScriptInstance.cs
index 674144b..611df58 100644
--- a/OpenSim/Region/ScriptEngine/Shared/Instance/ScriptInstance.cs
+++ b/OpenSim/Region/ScriptEngine/Shared/Instance/ScriptInstance.cs
@@ -416,7 +416,6 @@ namespace OpenSim.Region.ScriptEngine.Shared.Instance
                    PostEvent(new EventParams("on_rez",
                        new Object[] {new LSL_Types.LSLInteger(StartParam)}, new DetectParams[0]));
                }
                if (m_stateSource == StateSource.AttachedRez)
                {
                    PostEvent(new EventParams("attach",
@@ -457,7 +456,6 @@ namespace OpenSim.Region.ScriptEngine.Shared.Instance
                    PostEvent(new EventParams("attach",
                        new object[] { new LSL_Types.LSLString(m_AttachedAvatar.ToString()) }, new DetectParams[0]));
                }
            }
        }
@@ -807,9 +805,10 @@ namespace OpenSim.Region.ScriptEngine.Shared.Instance
            lock (EventQueue)
            {
                data = (EventParams)EventQueue.Dequeue();
-                if (data == null) // Shouldn't happen
+                if (data == null)
                {
-                    if (EventQueue.Count > 0 && Running && !ShuttingDown)
+                    // check if a null event was enqueued or if its really empty
+                    if (EventQueue.Count > 0 && Running && !ShuttingDown && !m_InSelfDelete)
                    {
                        m_CurrentWorkItem = Engine.QueueEventHandler(this);
                    }
@@ -870,13 +869,14 @@ namespace OpenSim.Region.ScriptEngine.Shared.Instance
            }
            else
            {
+                Exception e = null;
                if (Engine.World.PipeEventsForScript(LocalID) ||
                    data.EventName == "control") // Don't freeze avies!
                {
                    //                        m_log.DebugFormat("[Script] Delivered event {2} in state {3} to {0}.{1}",
                    //                                PrimName, ScriptName, data.EventName, State);
                    try
                    {
                        m_CurrentEvent = data.EventName;
@@ -891,6 +891,8 @@ namespace OpenSim.Region.ScriptEngine.Shared.Instance
                        {
                            m_InEvent = false;
                            m_CurrentEvent = String.Empty;
+                            lock (EventQueue)
+                                m_CurrentWorkItem = null; // no longer in a event that can be canceled
                        }
                        if (m_SaveState)
@@ -903,7 +905,12 @@ namespace OpenSim.Region.ScriptEngine.Shared.Instance
                            m_SaveState = false;
                        }
                    }
-                    catch (Exception e)
+                    catch (Exception exx)
+                    {
+                        e = exx;
+                    }
+                    if(e != null)
                    {
                        //                            m_log.DebugFormat(
                        //                                "[SCRIPT] Exception in script {0} {1}: {2}{3}",
@@ -979,7 +986,7 @@ namespace OpenSim.Region.ScriptEngine.Shared.Instance
                                    ScriptTask.ItemID, ScriptTask.AssetID, data.EventName, EventsProcessed);
                }
-                if (EventQueue.Count > 0 && Running && !ShuttingDown)
+                if (EventQueue.Count > 0 && Running && !ShuttingDown && !m_InSelfDelete)
                {
                    m_CurrentWorkItem = Engine.QueueEventHandler(this);
                }
diff --git a/OpenSim/Region/ScriptEngine/Shared/LSL_Types.cs b/OpenSim/Region/ScriptEngine/Shared/LSL_Types.cs
index d501979..9fb1e2c 100644
--- a/OpenSim/Region/ScriptEngine/Shared/LSL_Types.cs
+++ b/OpenSim/Region/ScriptEngine/Shared/LSL_Types.cs
@@ -339,7 +339,7 @@ namespace OpenSim.Region.ScriptEngine.Shared
                y = (float)Quat.y;
                z = (float)Quat.z;
                s = (float)Quat.s;
-                if (x == 0 && y == 0 && z == 0 && s == 0)
+                if (s == 0 && x == 0 && y == 0 && z == 0)
                    s = 1;
            }
@@ -349,7 +349,7 @@ namespace OpenSim.Region.ScriptEngine.Shared
                y = Y;
                z = Z;
                s = S;
-                if (x == 0 && y == 0 && z == 0 && s == 0)
+                if (s == 0 && x == 0 && y == 0 && z == 0)
                    s = 1;
            }
@@ -368,7 +368,7 @@ namespace OpenSim.Region.ScriptEngine.Shared
                res = res & Double.TryParse(tmps[1], NumberStyles.Float, Culture.NumberFormatInfo, out y);
                res = res & Double.TryParse(tmps[2], NumberStyles.Float, Culture.NumberFormatInfo, out z);
                res = res & Double.TryParse(tmps[3], NumberStyles.Float, Culture.NumberFormatInfo, out s);
-                if (x == 0 && y == 0 && z == 0 && s == 0)
+                if (s == 0 && x == 0 && y == 0 && z == 0)
                    s = 1;
            }
diff --git a/OpenSim/Region/ScriptEngine/XEngine/EventManager.cs b/OpenSim/Region/ScriptEngine/XEngine/EventManager.cs
index f1b1e66..301eada 100644
--- a/OpenSim/Region/ScriptEngine/XEngine/EventManager.cs
+++ b/OpenSim/Region/ScriptEngine/XEngine/EventManager.cs
@@ -408,10 +408,17 @@ namespace OpenSim.Region.ScriptEngine.XEngine
        public void attach(uint localID, UUID itemID, UUID avatar)
        {
-            myScriptEngine.PostObjectEvent(localID, new EventParams(
+            SceneObjectGroup grp = myScriptEngine.World.GetSceneObjectGroup(localID);
+            if(grp == null)
+                return;
+            foreach(SceneObjectPart part in grp.Parts)
+            { 
+                myScriptEngine.PostObjectEvent(part.LocalId, new EventParams(
                    "attach",new object[] {
                    new LSL_Types.LSLString(avatar.ToString()) },
                    new DetectParams[0]));
+            }
        }
        // dataserver: not handled here
diff --git a/OpenSim/Region/ScriptEngine/XEngine/XEngine.cs b/OpenSim/Region/ScriptEngine/XEngine/XEngine.cs
index 78d4ee9..3038915 100755
--- a/OpenSim/Region/ScriptEngine/XEngine/XEngine.cs
+++ b/OpenSim/Region/ScriptEngine/XEngine/XEngine.cs
@@ -1024,18 +1024,15 @@ namespace OpenSim.Region.ScriptEngine.XEngine
 //                m_log.DebugFormat("[XEngine]: Added script {0} to compile queue", itemID);
-                if (m_CurrentCompile == null)
+                // NOTE: Although we use a lockless queue, the lock here
+                // is required. It ensures that there are never two
+                // compile threads running, which, due to a race
+                // conndition, might otherwise happen
+                //
+                lock (m_CompileQueue)
                {
-                    // NOTE: Although we use a lockless queue, the lock here
+                    if (m_CurrentCompile == null)
-                    // is required. It ensures that there are never two
+                        m_CurrentCompile = m_ThreadPool.QueueWorkItem(DoOnRezScriptQueue, null);
-                    // compile threads running, which, due to a race
-                    // conndition, might otherwise happen
-                    //
-                    lock (m_CompileQueue)
-                    {
-                        if (m_CurrentCompile == null)
-                            m_CurrentCompile = m_ThreadPool.QueueWorkItem(DoOnRezScriptQueue, null);
-                    }
                }
            }
        }
@@ -1281,6 +1278,12 @@ namespace OpenSim.Region.ScriptEngine.XEngine
                }
            }
+            // do not load a assembly on top of a lot of to release memory
+            // also yield a bit
+            // only if logins disable since causes a lot of rubber banding
+            if(!m_Scene.LoginsEnabled)
+                GC.Collect(2);
            ScriptInstance instance = null;
            lock (m_Scripts)
            {
@@ -1288,26 +1291,27 @@ namespace OpenSim.Region.ScriptEngine.XEngine
                if ((!m_Scripts.ContainsKey(itemID)) ||
                    (m_Scripts[itemID].AssetID != assetID))
                {
-                    UUID appDomain = assetID;
+//                    UUID appDomain = assetID;
-                    if (part.ParentGroup.IsAttachment)
+//                    if (part.ParentGroup.IsAttachment)
-                        appDomain = part.ParentGroup.RootPart.UUID;
+//                        appDomain = part.ParentGroup.RootPart.UUID;
+                    UUID appDomain = part.ParentGroup.RootPart.UUID;
                    if (!m_AppDomains.ContainsKey(appDomain))
                    {
                        try
                        {
-                            AppDomainSetup appSetup = new AppDomainSetup();
+                            AppDomain sandbox;
-                            appSetup.PrivateBinPath = Path.Combine(
+                            if (m_AppDomainLoading)
+                            {
+                                AppDomainSetup appSetup = new AppDomainSetup();
+                                appSetup.PrivateBinPath = Path.Combine(
                                    m_ScriptEnginesPath,
                                    m_Scene.RegionInfo.RegionID.ToString());
-                            Evidence baseEvidence = AppDomain.CurrentDomain.Evidence;
+                                Evidence baseEvidence = AppDomain.CurrentDomain.Evidence;
-                            Evidence evidence = new Evidence(baseEvidence);
+                                Evidence evidence = new Evidence(baseEvidence);
-                            AppDomain sandbox;
-                            if (m_AppDomainLoading)
-                            {
                                sandbox = AppDomain.CreateDomain(
                                                m_Scene.RegionInfo.RegionID.ToString(),
                                                evidence, appSetup);
@@ -1472,9 +1476,7 @@ namespace OpenSim.Region.ScriptEngine.XEngine
                                                  startParam, postOnRez,
                                                  m_MaxScriptQueue);
-                    if (
+                    if(!instance.Load(scriptObj, coopSleepHandle, assemblyPath,
-                        !instance.Load(
-                            scriptObj, coopSleepHandle, assemblyPath,
                            Path.Combine(ScriptEnginePath, World.RegionInfo.RegionID.ToString()), stateSource, coopTerminationForThisScript))
                            return false;
@@ -1506,11 +1508,12 @@ namespace OpenSim.Region.ScriptEngine.XEngine
                    m_PrimObjects[localID].Add(itemID);
            }
-            if (!m_Assemblies.ContainsKey(assetID))
-                m_Assemblies[assetID] = assemblyPath;
            lock (m_AddingAssemblies) 
            {
+                if (!m_Assemblies.ContainsKey(assetID))
+                    m_Assemblies[assetID] = assemblyPath;
                m_AddingAssemblies[assemblyPath]--;
            }