Merge branch 'master' into httptests

24 files changed, 316 insertions, 294 deletions

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;
-                        },
-                        null,
-                        "XferTimeTick");
+                        else
+                        {
+                            inTimeTick = true;
+
+                            //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,
-                    null, assetID, Vector3.Zero, Vector3.Zero, UUID.Zero, (byte)1, true,
+                objatt = m_invAccessModule.RezObject(sp.ControllingClient, 
+                    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(
-                        "Error updating classified", false);
-                return;
+                remoteClient.SendAgentAlertMessage("Error updating classified", false);
             }
         }
 
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.SendAlertMessage("Notecard saved");
+                    remoteClient.SendAgentAlertMessage("Insufficient permissions to edit notecard", false);
+                    return UUID.Zero;
                 }
-                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");
-                }
-                else if ((CustomInventoryType)item.InvType == CustomInventoryType.AnimationSet)
+               remoteClient.SendAlertMessage("Notecard saved");
+            }
+            else if ((InventoryType)item.InvType == InventoryType.LSL)
+            {
+                if (!m_Scene.Permissions.CanEditScript(itemID, UUID.Zero, remoteClient.AgentId))
                 {
-                    AnimationSet animSet = new AnimationSet(data);
-                    if (!animSet.Validate(x => {
+                    remoteClient.SendAgentAlertMessage("Insufficient permissions to edit script", false);
+                    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 =
-                    CreateAsset(item.Name, item.Description, (sbyte)item.AssetType, data, remoteClient.AgentId.ToString());
-                item.AssetID = asset.FullID;
-                m_Scene.AssetService.Store(asset);
-
-                m_Scene.InventoryService.UpdateItem(item);
+            AssetBase asset =
+                CreateAsset(item.Name, item.Description, (sbyte)item.AssetType, data, remoteClient.AgentId.ToString());
+            item.AssetID = asset.FullID;
+            m_Scene.AssetService.Store(asset);
 
-                // remoteClient.SendInventoryItemCreateUpdate(item);
-                return (asset.FullID);
-            }
-            else
-            {
-                m_log.ErrorFormat(
-                    "[INVENTORY ACCESS MODULE]: Could not find item {0} for caps inventory update",
-                    itemID);
-            }
+            m_Scene.InventoryService.UpdateItem(item);
 
-            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);
+                Bitmap image2 = new Bitmap(image);
+                image.Dispose();
 
-                        if (setNewAlpha)
-                            SetAlpha(ref image1, newAlpha);
+                if (setNewAlpha)
+                    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
-                        {
-                            result = OpenJPEG.EncodeFromImage(joint, true);
-                        }
-                        catch (Exception e)
-                        {
-                            m_log.ErrorFormat(
-                                "[DYNAMICTEXTUREMODULE]: OpenJpeg Encode Failed.  Exception {0}{1}",
+                    try
+                    {
+                        result = OpenJPEG.EncodeFromImage(joint, true);
+                    }
+                    catch (Exception e)
+                    {
+                        m_log.ErrorFormat(
+                        "[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);
-
-                jG.DrawImage(back, 0, 0, back.Width, back.Height);
-                jG.DrawImage(front, 0, 0, back.Width, back.Height);
-
-                return joint;
+                using(jG = Graphics.FromImage(joint))
+                {
+                    jG.DrawImage(back, 0, 0, back.Width, back.Height);
+                    jG.DrawImage(front, 0, 0, back.Width, back.Height);
+                    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}",
-                regionHandle, m_Scenes.Count);
+//            m_log.DebugFormat("[LAND IN CONNECTOR]: GetLandData for {0}. Count = {1}",
+//                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 (isHG && m_Cache != null)
-                m_Cache.Cache(asset);
+           if(asset.ID != id)
+           {
+                asset.ID = id;
+                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}",
-                  regionHandle, x, y);
+//            m_log.DebugFormat("[LAND CONNECTOR]: request for land data in {0} at {1}, {2}",
+//                  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 = new byte[input.Length];
-                input.Read(bdata, 0, (int)input.Length);
+                byte[] bdata;
+                using(FileStream input = new FileStream(Util.dataDir() + "/terrain.raw",FileMode.Open))
+                {
+                    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("terrain.raw", clientFileName);
+                remote_client.SendInitiateDownload(xfername, 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 = new Quaternion(llrot.W, llrot.X, llrot.Y, llrot.Z);
+                                        Quaternion rot = part.GetWorldRotation();
                                         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);
-
-            colours.Save(filename, ImageFormat.Bmp);
+            using(Bitmap colours = CreateGrayscaleBitmapFromMap(map))
+                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);
-
-            colours.Save(stream, ImageFormat.Png);
+            using(Bitmap colours = CreateGrayscaleBitmapFromMap(map))
+                colours.Save(stream,ImageFormat.Bmp);
         }
 
         /// <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);
-
-            colours.Save(filename, ImageFormat.Gif);
+            using(Bitmap colours = CreateGrayscaleBitmapFromMap(map))
+                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);
-
-            colours.Save(stream, ImageFormat.Gif);
+            using(Bitmap colours = CreateGrayscaleBitmapFromMap(map))
+                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);
-
-            colours.Save(filename, ImageFormat.Png);
+            using(Bitmap colours = CreateGrayscaleBitmapFromMap(map))
+                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);
-
-            colours.Save(stream, ImageFormat.Png);
+            using(Bitmap colours = CreateGrayscaleBitmapFromMap(map))
+                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);
-
-            colours.Save(filename, ImageFormat.Jpeg);
+            using(Bitmap colours = CreateBitmapFromMap(map))
+                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);
-
-            colours.Save(stream, ImageFormat.Jpeg);
+            using(Bitmap colours = CreateBitmapFromMap(map))
+                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);
-
-            colours.Save(filename, ImageFormat.Png);
+            using(Bitmap colours = CreateGrayscaleBitmapFromMap(map))
+                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);
-
-            colours.Save(stream, ImageFormat.Png);
+            using(Bitmap colours = CreateGrayscaleBitmapFromMap(map))
+                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);
-
-            colours.Save(filename, ImageFormat.Tiff);
+            using(Bitmap colours = CreateGrayscaleBitmapFromMap(map))
+                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);
-
-            colours.Save(stream, ImageFormat.Tiff);
+            using(Bitmap colours = CreateGrayscaleBitmapFromMap(map))
+                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);
-            renderer.Scene.autoCalcNormals = false;
+            if(!renderer.CreateScene(width, height))
+                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.orthoViewWidth = viewport.OrthoWindowWidth;
-                renderer.Scene.defaultCamera.orthoViewHeight = viewport.OrthoWindowHeight;
+                renderer.Scene.defaultCamera.setOrthographic(true,viewport.OrthoWindowWidth, viewport.OrthoWindowHeight);
             }
             else
             {
@@ -247,24 +234,8 @@ namespace OpenSim.Region.CoreModules.World.Warp3DMap
             renderer.Render();
             Bitmap bitmap = renderer.Scene.getImage();
 
-            if (m_useAntiAliasing)
-            {
-                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.Scene.destroy();
+            renderer.Reset();
             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]);
-                    obj.addVertex(new warp_Vertex(pos,
-                        x / (float)m_scene.RegionInfo.RegionSizeX,
-                        (((float)m_scene.RegionInfo.RegionSizeY) - y) / m_scene.RegionInfo.RegionSizeY));
+                    warp_Vector pos = ConvertVector(x , y , (float)terrain[(int)x, (int)y]);
+                    obj.addVertex(new warp_Vertex(pos, x *  invsx, 1.0f - y * invsy));
                 }
             }
 
-            // Now that we have all the vertices, make another pass and create
-            //     the normals for each of the surface triangles and
-            //     create the list of triangle indices.
-            for (float y = 0; y < m_scene.RegionInfo.RegionSizeY; y += diff)
+            // Now that we have all the vertices, make another pass and
+            // create the list of triangle indices.
+            float invdiff = 1.0f / 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 newY = y / diff;
-                    if (newX < 255 && newY < 255)
+                    float newX = x * invdiff;
+                    float newY = y * invdiff;
+                    if (newX < limx && newY < limy)
                     {
-                        int v = (int)newY * 256 + (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;
+                        int v = (int)newY * npointsx + (int)newX;
 
                         // 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 + 256,
+                            v + npointsx + 1,
+                            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 (
-                Bitmap image
-                    = TerrainSplat.Splat(
+            using (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,
-                                                                                        DetailLevel.Medium);
+                                    renderMesh = m_primMesher.GenerateFacetedSculptMesh(omvPrim,(Bitmap)sculpt,
+                                                                                            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);
-                    
-                    if (prim.Shape.SculptTexture == UUID.Zero)
-                        norm = norm.reverse();
-                    warp_Vertex vert = new warp_Vertex(pos, norm, v.TexCoord.X, v.TexCoord.Y);
-
+                    warp_Vertex vert = new warp_Vertex(pos, 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);