Merge branch 'master' of git://opensimulator.org/git/opensim

OpenSim/Region/CoreModules/Framework/InventoryAccess/InventoryAccessModule.cs

@@ -196,13 +196,24 @@ namespace OpenSim.Region.CoreModules.Framework.InventoryAccess
             // currently calls this with multiple items.
             UUID ret = UUID.Zero; 
 
+            Dictionary<UUID, List<SceneObjectGroup>> deletes =
+                    new Dictionary<UUID, List<SceneObjectGroup>>();
+
             foreach (SceneObjectGroup g in objectGroups)
-                ret = DeleteToInventory(action, folderID, g, remoteClient);
+            {
+                if (!deletes.ContainsKey(g.OwnerID))
+                    deletes[g.OwnerID] = new List<SceneObjectGroup>();
+
+                deletes[g.OwnerID].Add(g);
+            }
+
+            foreach (List<SceneObjectGroup> objlist in deletes.Values)
+                ret = DeleteToInventory(action, folderID, objlist, remoteClient);
 
             return ret;
         }
 
-        public virtual UUID DeleteToInventory(DeRezAction action, UUID folderID,
+        private UUID DeleteToInventory(DeRezAction action, UUID folderID,
                 SceneObjectGroup objectGroup, IClientAPI remoteClient)
         {
             UUID assetID = UUID.Zero;
@@ -314,6 +325,15 @@ namespace OpenSim.Region.CoreModules.Framework.InventoryAccess
                         folder = m_Scene.InventoryService.GetFolderForType(userID, AssetType.TrashFolder);
                     }
                     else
+                    {
+                        if (remoteClient == null ||
+                            objectGroup.OwnerID != remoteClient.AgentId)
+                        {
+                            // Taking copy of another person's item. Take to
+                            // Objects folder.
+                            folder = m_Scene.InventoryService.GetFolderForType(userID, AssetType.Object);
+                        }
+                        else
                         {
                             // Catch all. Use lost & found
                             //
@@ -321,6 +341,7 @@ namespace OpenSim.Region.CoreModules.Framework.InventoryAccess
                             folder = m_Scene.InventoryService.GetFolderForType(userID, AssetType.LostAndFoundFolder);
                         }
                     }
+                }
 
                 // Override and put into where it came from, if it came
                 // from anywhere in inventory

OpenSim/Region/CoreModules/Resources/CoreModulePlugin.addin.xml

@@ -76,6 +76,8 @@
         <RegionModule id="GridInfoServiceInConnectorModule" type="OpenSim.Region.CoreModules.ServiceConnectorsIn.Grid.GridInfoServiceInConnectorModule" />    \
         <RegionModule id="AuthenticationServiceInConnectorModule" type="OpenSim.Region.CoreModules.ServiceConnectorsIn.Authentication.AuthenticationServiceInConnectorModule" />
         <RegionModule id="AccessModule" type="OpenSim.Region.CoreModules.World.AccessModule" />    \
+        <RegionModule id="MapImageModule" type="OpenSim.Region.CoreModules.World.LegacyMap.MapImageModule" />    \
+        <RegionModule id="Warp3DImageModule" type="OpenSim.Region.CoreModules.World.Warp3DMap.Warp3DImageModule" />    \
 
     </Extension>
 

OpenSim/Region/CoreModules/World/LegacyMap/MapImageModule.cs

@@ -59,7 +59,7 @@ namespace OpenSim.Region.CoreModules.World.LegacyMap
         public face[] trns;
     }
 
-    public class MapImageModule : IMapImageGenerator, IRegionModule
+    public class MapImageModule : IMapImageGenerator, INonSharedRegionModule
     {
         private static readonly ILog m_log =
             LogManager.GetLogger(MethodBase.GetCurrentMethod().DeclaringType);
@@ -67,6 +67,7 @@ namespace OpenSim.Region.CoreModules.World.LegacyMap
         private Scene m_scene;
         private IConfigSource m_config;
         private IMapTileTerrainRenderer terrainRenderer;
+        private bool m_Enabled = false;
 
         #region IMapImageGenerator Members
 
@@ -132,9 +133,8 @@ namespace OpenSim.Region.CoreModules.World.LegacyMap
 
         #region IRegionModule Members
 
-        public void Initialise(Scene scene, IConfigSource source)
+        public void Initialise(IConfigSource source)
         {
-            m_scene = scene;
             m_config = source;
 
             IConfig startupConfig = m_config.Configs["Startup"];
@@ -142,10 +142,24 @@ namespace OpenSim.Region.CoreModules.World.LegacyMap
                     "MapImageModule")
                 return;
 
+            m_Enabled = true;
+        }
+
+        public void AddRegion(Scene scene)
+        {
+            if (!m_Enabled)
+                return;
+
+            m_scene = scene;
+
             m_scene.RegisterModuleInterface<IMapImageGenerator>(this);
         }
 
-        public void PostInitialise()
+        public void RegionLoaded(Scene scene)
+        {
+        }
+
+        public void RemoveRegion(Scene scene)
         {
         }
 
@@ -158,9 +172,9 @@ namespace OpenSim.Region.CoreModules.World.LegacyMap
             get { return "MapImageModule"; }
         }
 
-        public bool IsSharedModule
+        public Type ReplaceableInterface
         {
-            get { return false; }
+            get { return null; }
         }
 
         #endregion
@@ -546,7 +560,7 @@ namespace OpenSim.Region.CoreModules.World.LegacyMap
             return returnpt;
         }
 
-        public Bitmap CreateViewImage(Vector3 camPos, Vector3 camDir, float fov, int width, int height)
+        public Bitmap CreateViewImage(Vector3 camPos, Vector3 camDir, float fov, int width, int height, bool useTextures)
         {
             return null;
         }

OpenSim/Region/CoreModules/World/Warp3DMap/MapImageModule.cs

@@ -49,7 +49,7 @@ using WarpRenderer = global::Warp3D.Warp3D;
 
 namespace OpenSim.Region.CoreModules.World.Warp3DMap
 {
-    public class Warp3DImageModule : IMapImageGenerator, IRegionModule
+    public class Warp3DImageModule : IMapImageGenerator, INonSharedRegionModule
     {
         private static readonly UUID TEXTURE_METADATA_MAGIC = new UUID("802dc0e0-f080-4931-8b57-d1be8611c4f3");
         private static readonly Color4 WATER_COLOR = new Color4(29, 71, 95, 216);
@@ -62,18 +62,28 @@ namespace OpenSim.Region.CoreModules.World.Warp3DMap
         private IConfigSource m_config;
         private Dictionary<UUID, Color4> m_colors = new Dictionary<UUID, Color4>();
         private bool m_useAntiAliasing = true; // TODO: Make this a config option
+        private bool m_Enabled = false;
 
         #region IRegionModule Members
 
-        public void Initialise(Scene scene, IConfigSource source)
+        public void Initialise(IConfigSource source)
         {
-            m_scene = scene;
             m_config = source;
 
             IConfig startupConfig = m_config.Configs["Startup"];
             if (startupConfig.GetString("MapImageModule", "MapImageModule") != "Warp3DImageModule")
                 return;
 
+            m_Enabled = true;
+        }
+
+        public void AddRegion(Scene scene)
+        {
+            if (!m_Enabled)
+                return;
+
+            m_scene = scene;
+
             List<string> renderers = RenderingLoader.ListRenderers(Util.ExecutingDirectory());
             if (renderers.Count > 0)
             {
@@ -88,7 +98,11 @@ namespace OpenSim.Region.CoreModules.World.Warp3DMap
             m_scene.RegisterModuleInterface<IMapImageGenerator>(this);
         }
 
-        public void PostInitialise()
+        public void RegionLoaded(Scene scene)
+        {
+        }
+
+        public void RemoveRegion(Scene scene)
         {
         }
 
@@ -101,9 +115,9 @@ namespace OpenSim.Region.CoreModules.World.Warp3DMap
             get { return "Warp3DImageModule"; }
         }
 
-        public bool IsSharedModule
+        public Type ReplaceableInterface
         {
-            get { return false; }
+            get { return null; }
         }
 
         #endregion
@@ -114,16 +128,16 @@ namespace OpenSim.Region.CoreModules.World.Warp3DMap
         {
             Vector3 camPos = new Vector3(127.5f, 127.5f, 221.7025033688163f);
             Viewport viewport = new Viewport(camPos, -Vector3.UnitZ, 1024f, 0.1f, (int)Constants.RegionSize, (int)Constants.RegionSize, (float)Constants.RegionSize, (float)Constants.RegionSize);
-            return CreateMapTile(viewport);
+            return CreateMapTile(viewport, false);
         }
 
-        public Bitmap CreateViewImage(Vector3 camPos, Vector3 camDir, float fov, int width, int height)
+        public Bitmap CreateViewImage(Vector3 camPos, Vector3 camDir, float fov, int width, int height, bool useTextures)
         {
             Viewport viewport = new Viewport(camPos, camDir, fov, (float)Constants.RegionSize, 0.1f, width, height);
-            return CreateMapTile(viewport);
+            return CreateMapTile(viewport, useTextures);
         }
 
-        public Bitmap CreateMapTile(Viewport viewport)
+        public Bitmap CreateMapTile(Viewport viewport, bool useTextures)
         {
             bool drawPrimVolume = true;
             bool textureTerrain = true;
@@ -184,7 +198,7 @@ namespace OpenSim.Region.CoreModules.World.Warp3DMap
             CreateWater(renderer);
             CreateTerrain(renderer, textureTerrain);
             if (drawPrimVolume)
-                CreateAllPrims(renderer);
+                CreateAllPrims(renderer, useTextures);
 
             renderer.Render();
             Bitmap bitmap = renderer.Scene.getImage();
@@ -311,7 +325,7 @@ namespace OpenSim.Region.CoreModules.World.Warp3DMap
             renderer.SetObjectMaterial("Terrain", "TerrainColor");
         }
 
-        private void CreateAllPrims(WarpRenderer renderer)
+        private void CreateAllPrims(WarpRenderer renderer, bool useTextures)
         {
             if (m_primMesher == null)
                 return;
@@ -319,14 +333,15 @@ namespace OpenSim.Region.CoreModules.World.Warp3DMap
             m_scene.ForEachSOG(
                 delegate(SceneObjectGroup group)
                 {
-                    CreatePrim(renderer, group.RootPart);
+                    CreatePrim(renderer, group.RootPart, useTextures);
                     foreach (SceneObjectPart child in group.Parts)
-                        CreatePrim(renderer, child);
+                        CreatePrim(renderer, child, useTextures);
                 }
             );
         }
 
-        private void CreatePrim(WarpRenderer renderer, SceneObjectPart prim)
+        private void CreatePrim(WarpRenderer renderer, SceneObjectPart prim,
+                bool useTextures)
         {
             const float MIN_SIZE = 2f;
 
@@ -357,6 +372,7 @@ namespace OpenSim.Region.CoreModules.World.Warp3DMap
             string primID = prim.UUID.ToString();
 
             // Create the prim faces
+            // TODO: Implement the useTextures flag behavior
             for (int i = 0; i < renderMesh.Faces.Count; i++)
             {
                 Face face = renderMesh.Faces[i];

OpenSim/Region/Framework/Interfaces/ITerrain.cs

@@ -75,7 +75,7 @@ namespace OpenSim.Region.Framework.Interfaces
     public interface IMapImageGenerator
     {
         System.Drawing.Bitmap CreateMapTile();
-        System.Drawing.Bitmap CreateViewImage(Vector3 camPos, Vector3 camDir, float fov, int width, int height);
+        System.Drawing.Bitmap CreateViewImage(Vector3 camPos, Vector3 camDir, float fov, int width, int height, bool useTextures);
         byte[] WriteJpeg2000Image();
     }
 }

OpenSim/Region/Framework/Scenes/Scene.Inventory.cs

@@ -1689,37 +1689,6 @@ namespace OpenSim.Region.Framework.Scenes
             }
         }
 
-          /// <summary>
-        /// Called when one or more objects are removed from the environment into inventory.
-        /// </summary>
-        /// <param name="remoteClient"></param>
-        /// <param name="localID"></param>
-        /// <param name="groupID"></param>
-        /// <param name="action"></param>
-        /// <param name="destinationID"></param>
-        public virtual void DeRezObject(IClientAPI remoteClient, List<uint> localIDs,
-                UUID groupID, DeRezAction action, UUID destinationID)
-        {
-            foreach (uint localID in localIDs)
-            {
-                DeRezObject(remoteClient, localID, groupID, action, destinationID);
-            }
-        }
-
-        /// <summary>
-        /// Called when an object is removed from the environment into inventory.
-        /// </summary>
-        /// <param name="remoteClient"></param>
-        /// <param name="localID"></param>
-        /// <param name="groupID"></param>
-        /// <param name="action"></param>
-        /// <param name="destinationID"></param>
-        public virtual void DeRezObject(IClientAPI remoteClient, uint localID,
-                UUID groupID, DeRezAction action, UUID destinationID)
-        {
-            DeRezObjects(remoteClient, new List<uint>() { localID }, groupID, action, destinationID);
-        }
-
         public virtual void DeRezObjects(IClientAPI remoteClient, List<uint> localIDs,
                 UUID groupID, DeRezAction action, UUID destinationID)
         {
@@ -1990,14 +1959,19 @@ namespace OpenSim.Region.Framework.Scenes
             return group;
         }
 
-        public virtual bool returnObjects(SceneObjectGroup[] returnobjects, UUID AgentId)
+        public virtual bool returnObjects(SceneObjectGroup[] returnobjects,
+                UUID AgentId)
         {
+            List<uint> localIDs = new List<uint>();
+
             foreach (SceneObjectGroup grp in returnobjects)
             {
-                AddReturn(grp.OwnerID, grp.Name, grp.AbsolutePosition, "parcel owner return");
+                AddReturn(grp.OwnerID, grp.Name, grp.AbsolutePosition,
-                DeRezObject(null, grp.RootPart.LocalId,
+                        "parcel owner return");
-                        grp.RootPart.GroupID, DeRezAction.Return, UUID.Zero);
+                localIDs.Add(grp.RootPart.LocalId);
             }
+            DeRezObjects(null, localIDs, UUID.Zero, DeRezAction.Return,
+                    UUID.Zero);
 
             return true;
         }

OpenSim/Region/Framework/Scenes/Scene.cs

@@ -2735,7 +2735,7 @@ namespace OpenSim.Region.Framework.Scenes
             client.OnGrabUpdate += m_sceneGraph.MoveObject;
             client.OnSpinStart += m_sceneGraph.SpinStart;
             client.OnSpinUpdate += m_sceneGraph.SpinObject;
-            client.OnDeRezObject += DeRezObject;
+            client.OnDeRezObject += DeRezObjects;
             
             client.OnObjectName += m_sceneGraph.PrimName;
             client.OnObjectClickAction += m_sceneGraph.PrimClickAction;
@@ -2864,7 +2864,7 @@ namespace OpenSim.Region.Framework.Scenes
             client.OnGrabUpdate -= m_sceneGraph.MoveObject;
             client.OnSpinStart -= m_sceneGraph.SpinStart;
             client.OnSpinUpdate -= m_sceneGraph.SpinObject;
-            client.OnDeRezObject -= DeRezObject;
+            client.OnDeRezObject -= DeRezObjects;
             client.OnObjectName -= m_sceneGraph.PrimName;
             client.OnObjectClickAction -= m_sceneGraph.PrimClickAction;
             client.OnObjectMaterial -= m_sceneGraph.PrimMaterial;

OpenSim/Region/Framework/Scenes/SceneObjectGroup.cs

@@ -1304,8 +1304,8 @@ namespace OpenSim.Region.Framework.Scenes
                                 DetachFromBackup();
                                 m_log.InfoFormat("[SCENE]: Returning object {0} due to parcel auto return", RootPart.UUID.ToString());
                                 m_scene.AddReturn(OwnerID, Name, AbsolutePosition, "parcel auto return");
-                                m_scene.DeRezObject(null, RootPart.LocalId,
+                                m_scene.DeRezObjects(null, new List<uint>() { RootPart.LocalId }, UUID.Zero,
-                                    RootPart.GroupID, DeRezAction.Return, UUID.Zero);
+                                        DeRezAction.Return, UUID.Zero);
 
                                 return;
                             }

OpenSim/Region/Framework/Scenes/Tests/SceneObjectBasicTests.cs

@@ -142,7 +142,7 @@ namespace OpenSim.Region.Framework.Scenes.Tests
             SceneObjectPart part = SceneSetupHelpers.AddSceneObject(scene);
 
             IClientAPI client = SceneSetupHelpers.AddRootAgent(scene, agentId);
-            scene.DeRezObject(client, part.LocalId, UUID.Zero, DeRezAction.Delete, UUID.Zero);
+            scene.DeRezObjects(client, new System.Collections.Generic.List<uint>() { part.LocalId }, UUID.Zero, DeRezAction.Delete, UUID.Zero);
 
             SceneObjectPart retrievedPart = scene.GetSceneObjectPart(part.LocalId);
 

OpenSim/Region/OptionalModules/Resources/OptionalModules.addin.xml

@@ -12,5 +12,6 @@
       <RegionModule id="IRCBridge"             type="OpenSim.Region.OptionalModules.Avatar.Chat.IRCBridgeModule" />
       <RegionModule id="Concierge"             type="OpenSim.Region.OptionalModules.Avatar.Concierge.ConciergeModule" />
       <RegionModule id="VivoxVoice"            type="OpenSim.Region.OptionalModules.Avatar.Voice.VivoxVoice.VivoxVoiceModule" />
+      <RegionModule id="WorldViewModule"            type="OpenSim.Region.OptionalModules.World.WorldView.WorldViewModule" />
     </Extension>
 </Addin>

OpenSim/Region/OptionalModules/World/WorldView/WorldViewModule.cs

@@ -0,0 +1,122 @@
+/*
+ * Copyright (c) Contributors, http://opensimulator.org/
+ * See CONTRIBUTORS.TXT for a full list of copyright holders.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions are met:
+ *     * Redistributions of source code must retain the above copyright
+ *       notice, this list of conditions and the following disclaimer.
+ *     * Redistributions in binary form must reproduce the above copyright
+ *       notice, this list of conditions and the following disclaimer in the
+ *       documentation and/or other materials provided with the distribution.
+ *     * Neither the name of the OpenSimulator Project nor the
+ *       names of its contributors may be used to endorse or promote products
+ *       derived from this software without specific prior written permission.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE DEVELOPERS ``AS IS'' AND ANY
+ * EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
+ * WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
+ * DISCLAIMED. IN NO EVENT SHALL THE CONTRIBUTORS BE LIABLE FOR ANY
+ * DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
+ * (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
+ * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
+ * ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+ * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
+ * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+ */
+
+using System;
+using System.Collections.Generic;
+using System.Drawing;
+using System.Drawing.Imaging;
+using System.Reflection;
+using System.IO;
+using log4net;
+using Nini.Config;
+using OpenMetaverse;
+using OpenMetaverse.Imaging;
+using OpenSim.Framework;
+using OpenSim.Region.Framework.Interfaces;
+using OpenSim.Region.Framework.Scenes;
+using OpenSim.Server.Base;
+using OpenSim.Framework.Servers.HttpServer;
+using OpenSim.Services.Interfaces;
+
+namespace OpenSim.Region.OptionalModules.World.WorldView
+{
+    public class WorldViewModule : INonSharedRegionModule
+    {
+        private static readonly ILog m_log =
+            LogManager.GetLogger(MethodBase.GetCurrentMethod().DeclaringType);
+
+
+        private bool m_Enabled = false;
+        private IMapImageGenerator m_Generator;
+
+        public void Initialise(IConfigSource config)
+        {
+            IConfig moduleConfig = config.Configs["Modules"];
+            if (moduleConfig == null)
+                return;
+
+            if (moduleConfig.GetString("WorldViewModule", String.Empty) != Name)
+                return;
+
+            m_Enabled = true;
+        }
+
+        public void AddRegion(Scene scene)
+        {
+        }
+
+        public void RegionLoaded(Scene scene)
+        {
+            m_Generator = scene.RequestModuleInterface<IMapImageGenerator>();
+            if (m_Generator == null)
+            {
+                m_Enabled = false;
+                return;
+            }
+
+            m_log.Info("[WORLDVIEW]: Configured and enabled");
+
+            IHttpServer server = MainServer.GetHttpServer(0);
+            server.AddStreamHandler(new WorldViewRequestHandler(this,
+                    scene.RegionInfo.RegionID.ToString()));
+        }
+
+        public void RemoveRegion(Scene scene)
+        {
+        }
+
+        public string Name
+        {
+            get { return "WorldViewModule"; }
+        }
+
+        public Type ReplaceableInterface
+        {
+            get { return null; }
+        }
+
+        public void Close()
+        {
+        }
+
+        public byte[] GenerateWorldView(Vector3 pos, Vector3 rot, float fov,
+                int width, int height, bool usetex)
+        {
+            if (!m_Enabled)
+                return new Byte[0];
+
+            Bitmap bmp = m_Generator.CreateViewImage(pos, rot, fov, width,
+                    height, usetex);
+
+            MemoryStream str = new MemoryStream();
+
+            bmp.Save(str, ImageFormat.Jpeg);
+
+            return str.ToArray();
+        }
+    }
+}

OpenSim/Region/OptionalModules/World/WorldView/WorldViewRequestHandler.cs

@@ -0,0 +1,148 @@
+/*
+ * Copyright (c) Contributors, http://opensimulator.org/
+ * See CONTRIBUTORS.TXT for a full list of copyright holders.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions are met:
+ *     * Redistributions of source code must retain the above copyright
+ *       notice, this list of conditions and the following disclaimer.
+ *     * Redistributions in binary form must reproduce the above copyright
+ *       notice, this list of conditions and the following disclaimer in the
+ *       documentation and/or other materials provided with the distribution.
+ *     * Neither the name of the OpenSimulator Project nor the
+ *       names of its contributors may be used to endorse or promote products
+ *       derived from this software without specific prior written permission.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE DEVELOPERS ``AS IS'' AND ANY
+ * EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
+ * WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
+ * DISCLAIMED. IN NO EVENT SHALL THE CONTRIBUTORS BE LIABLE FOR ANY
+ * DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
+ * (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
+ * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
+ * ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+ * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
+ * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+ */
+
+using System;
+using System.Collections.Generic;
+using System.IO;
+using System.Reflection;
+using System.Xml;
+
+using OpenSim.Framework;
+using OpenSim.Server.Base;
+using OpenSim.Framework.Servers.HttpServer;
+using OpenSim.Region.Framework.Scenes;
+using OpenSim.Region.Framework.Interfaces;
+
+using OpenMetaverse;
+using log4net;
+
+namespace OpenSim.Region.OptionalModules.World.WorldView
+{
+    public class WorldViewRequestHandler : BaseStreamHandler
+    {
+        private static readonly ILog m_log = LogManager.GetLogger(MethodBase.GetCurrentMethod().DeclaringType);
+
+        protected WorldViewModule m_WorldViewModule;
+        protected Object m_RequestLock = new Object();
+
+        public WorldViewRequestHandler(WorldViewModule fmodule, string rid)
+                : base("GET", "/worldview/" + rid)
+        {
+            m_WorldViewModule = fmodule;
+        }
+
+        public override byte[] Handle(string path, Stream requestData,
+                OSHttpRequest httpRequest, OSHttpResponse httpResponse)
+        {
+            httpResponse.ContentType = "image/jpeg";
+
+//            StreamReader sr = new StreamReader(requestData);
+//            string body = sr.ReadToEnd();
+//            sr.Close();
+//            body = body.Trim();
+
+            try
+            {
+                lock (m_RequestLock)
+                {
+                    Dictionary<string, object> request =
+                            new Dictionary<string, object>();
+                    foreach (string name in httpRequest.QueryString)
+                        request[name] = httpRequest.QueryString[name];
+
+                    return SendWorldView(request);
+                }
+            }
+            catch (Exception e)
+            {
+                m_log.Debug("[WORLDVIEW]: Exception: " + e.ToString());
+            }
+
+            return new Byte[0];
+        }
+
+        public Byte[] SendWorldView(Dictionary<string, object> request)
+        {
+            float posX;
+            float posY;
+            float posZ;
+            float rotX;
+            float rotY;
+            float rotZ;
+            float fov;
+            int width;
+            int height;
+            bool usetex;
+
+            if (!request.ContainsKey("posX"))
+                return new Byte[0];
+            if (!request.ContainsKey("posY"))
+                return new Byte[0];
+            if (!request.ContainsKey("posZ"))
+                return new Byte[0];
+            if (!request.ContainsKey("rotX"))
+                return new Byte[0];
+            if (!request.ContainsKey("rotY"))
+                return new Byte[0];
+            if (!request.ContainsKey("rotZ"))
+                return new Byte[0];
+            if (!request.ContainsKey("fov"))
+                return new Byte[0];
+            if (!request.ContainsKey("width"))
+                return new Byte[0];
+            if (!request.ContainsKey("height"))
+                return new Byte[0];
+            if (!request.ContainsKey("usetex"))
+                return new Byte[0];
+
+            try
+            {
+                posX = Convert.ToSingle(request["posX"]);
+                posY = Convert.ToSingle(request["posY"]);
+                posZ = Convert.ToSingle(request["posZ"]);
+                rotX = Convert.ToSingle(request["rotX"]);
+                rotY = Convert.ToSingle(request["rotY"]);
+                rotZ = Convert.ToSingle(request["rotZ"]);
+                fov = Convert.ToSingle(request["fov"]);
+                width = Convert.ToInt32(request["width"]);
+                height = Convert.ToInt32(request["height"]);
+                usetex = Convert.ToBoolean(request["usetex"]);
+            }
+            catch
+            {
+                return new Byte[0];
+            }
+
+            Vector3 pos = new Vector3(posX, posY, posZ);
+            Vector3 rot = new Vector3(rotX, rotY, rotZ);
+
+            return m_WorldViewModule.GenerateWorldView(pos, rot, fov, width,
+                    height, usetex);
+        }
+    }
+}
+

OpenSim/Region/Physics/Meshing/Meshmerizer.cs

@@ -82,6 +82,7 @@ namespace OpenSim.Region.Physics.Meshing
             IConfig start_config = config.Configs["Startup"];
 
             decodedSculptMapPath = start_config.GetString("DecodedSculptMapPath","j2kDecodeCache");
+            cacheSculptMaps = start_config.GetBoolean("CacheSculptMaps", cacheSculptMaps);
 
             try
             {

OpenSim/Tests/Common/Setup/SceneSetupHelpers.cs

@@ -556,7 +556,7 @@ namespace OpenSim.Tests.Common.Setup
             AsyncSceneObjectGroupDeleter sogd = scene.SceneObjectGroupDeleter;
             sogd.Enabled = false;
 
-            scene.DeRezObject(client, part.LocalId, UUID.Zero, action, destinationId);
+            scene.DeRezObjects(client, new List<uint>() { part.LocalId }, UUID.Zero, action, destinationId);
             sogd.InventoryDeQueueAndDelete();
         }
     }

bin/OpenSim.ini.example

@@ -13,7 +13,10 @@
 ;;    An empty question will set the default if the dependencies are
 ;;    satisfied.
 ;;
-;; ; denotes a commented option. It is ignored.
+;; ;  denotes a commented out option. Uncomment it to actvate it
+;;    and change it to the desired value
+;;    Any options added to OpenSim.ini.exmaple must be commented out,
+;;    and their value must represent the default.
 
 [Startup]
     ;# {save_crashes} {} {Save crashes to disk?} {true false} false

bin/OpenSimDefaults.ini

@@ -140,6 +140,14 @@
     ;; Defaults to "j2kDecodeCache
     ;DecodedSculptMapPath = "j2kDecodeCache"
     
+    ;# {CacheSculptMaps} {Cache decoded sculpt maps?} {true false} true
+    ;; if you use Meshmerizer and want sculpt map collisions, setting this to
+    ;; to true will store decoded sculpt maps in a special folder in your bin
+    ;; folder, which can reduce startup times by reducing asset requests. Some
+    ;; versions of mono dont work well when reading the cache files, so set this
+    ;; to false if you have compatability problems.
+    ; CacheSculptMaps = true
+    
     ; Choose one of the physics engines below
     ; OpenDynamicsEngine is by some distance the most developed physics engine
     ; basicphysics effectively does not model physics at all, making all objects phantom