Initial update to OpenSim 0.8.2.1 source code.

6 files changed, 1198 insertions, 0 deletions

diff --git a/OpenSim/Region/OptionalModules/ViewerSupport/CameraOnlyModeModule.cs b/OpenSim/Region/OptionalModules/ViewerSupport/CameraOnlyModeModule.cs
new file mode 100644
index 0000000..7ae4223
--- /dev/null
+++ b/OpenSim/Region/OptionalModules/ViewerSupport/CameraOnlyModeModule.cs
@@ -0,0 +1,176 @@
+/*
+ * 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.IO;
+using System.Reflection;
+using System.Text;
+using System.Collections.Generic;
+using System.Threading;
+
+using OpenMetaverse;
+using OpenMetaverse.StructuredData;
+using OpenSim;
+using OpenSim.Region;
+using OpenSim.Region.Framework;
+using OpenSim.Region.Framework.Scenes;
+using OpenSim.Region.Framework.Interfaces;
+using OpenSim.Framework;
+//using OpenSim.Framework.Capabilities;
+using OpenSim.Framework.Servers;
+using OpenSim.Framework.Servers.HttpServer;
+using Nini.Config;
+using log4net;
+using Mono.Addins;
+using OSDMap = OpenMetaverse.StructuredData.OSDMap;
+using TeleportFlags = OpenSim.Framework.Constants.TeleportFlags;
+
+namespace OpenSim.Region.OptionalModules.ViewerSupport
+{
+    [Extension(Path = "/OpenSim/RegionModules", NodeName = "RegionModule", Id = "CameraOnlyMode")]
+    public class CameraOnlyModeModule : INonSharedRegionModule
+    {
+        private static readonly ILog m_log = LogManager.GetLogger(MethodBase.GetCurrentMethod().DeclaringType);
+
+        private Scene m_scene;
+        private SimulatorFeaturesHelper m_Helper;
+        private bool m_Enabled;
+        private int m_UserLevel;
+
+        public string Name
+        {
+            get { return "CameraOnlyModeModule"; }
+        }
+
+        public Type ReplaceableInterface
+        {
+            get { return null; }
+        }
+
+        public void Initialise(IConfigSource config)
+        {
+            IConfig moduleConfig = config.Configs["CameraOnlyModeModule"];
+            if (moduleConfig != null)
+            {
+                m_Enabled = moduleConfig.GetBoolean("enabled", false);
+                if (m_Enabled)
+                {
+                    m_UserLevel = moduleConfig.GetInt("UserLevel", 0);
+                    m_log.Info("[CAMERA-ONLY MODE]: CameraOnlyModeModule enabled");
+                }
+
+            }
+        }
+
+        public void Close()
+        {
+        }
+
+        public void AddRegion(Scene scene)
+        {
+            if (m_Enabled)
+            {
+                m_scene = scene;
+                //m_scene.EventManager.OnMakeRootAgent += (OnMakeRootAgent);
+            }
+        }
+
+        //private void OnMakeRootAgent(ScenePresence obj)
+        //{
+        //    throw new NotImplementedException();
+        //}
+
+        public void RegionLoaded(Scene scene)
+        {
+            if (m_Enabled)
+            {
+                IEntityTransferModule et = m_scene.RequestModuleInterface<IEntityTransferModule>();
+                m_Helper = new SimulatorFeaturesHelper(scene, et);
+
+                ISimulatorFeaturesModule featuresModule = m_scene.RequestModuleInterface<ISimulatorFeaturesModule>();
+                if (featuresModule != null)
+                    featuresModule.OnSimulatorFeaturesRequest += OnSimulatorFeaturesRequest;
+            }
+        }
+
+        public void RemoveRegion(Scene scene)
+        {
+        }
+
+        private void OnSimulatorFeaturesRequest(UUID agentID, ref OSDMap features)
+        {
+            m_log.DebugFormat("[CAMERA-ONLY MODE]: OnSimulatorFeaturesRequest in {0}", m_scene.RegionInfo.RegionName);
+            if (m_Helper.ShouldSend(agentID) && m_Helper.UserLevel(agentID) <= m_UserLevel)
+            {
+                OSDMap extrasMap;
+                if (features.ContainsKey("OpenSimExtras"))
+                {
+                    extrasMap = (OSDMap)features["OpenSimExtras"];
+                }
+                else
+                {
+                    extrasMap = new OSDMap();
+                    features["OpenSimExtras"] = extrasMap;
+                }
+                extrasMap["camera-only-mode"] = OSDMap.FromString("true");
+                m_log.DebugFormat("[CAMERA-ONLY MODE]: Sent in {0}", m_scene.RegionInfo.RegionName);
+
+                // Detaching attachments doesn't work for HG visitors,
+                // so I'm giving that up.
+                //Util.FireAndForget(delegate { DetachAttachments(agentID); });
+            }
+            else
+                m_log.DebugFormat("[CAMERA-ONLY MODE]: NOT Sending camera-only-mode in {0}", m_scene.RegionInfo.RegionName);
+        }
+
+        private void DetachAttachments(UUID agentID)
+        {
+            ScenePresence sp = m_scene.GetScenePresence(agentID);
+            if ((sp.TeleportFlags & TeleportFlags.ViaLogin) != 0)
+                // Wait a little, cos there's weird stuff going on at  login related to
+                // the Current Outfit Folder
+                Thread.Sleep(8000);
+
+            if (sp != null && m_scene.AttachmentsModule != null)
+            {
+                List<SceneObjectGroup> attachs = sp.GetAttachments();
+                if (attachs != null && attachs.Count > 0)
+                {
+                    foreach (SceneObjectGroup sog in attachs)
+                    {
+                        m_log.DebugFormat("[CAMERA-ONLY MODE]: Forcibly detaching attach {0} from {1} in {2}", 
+                            sog.Name, sp.Name, m_scene.RegionInfo.RegionName);
+
+                        m_scene.AttachmentsModule.DetachSingleAttachmentToInv(sp, sog);
+                    }
+                }
+            }
+        }
+
+    }
+
+}
diff --git a/OpenSim/Region/OptionalModules/ViewerSupport/DynamicFloaterModule.cs b/OpenSim/Region/OptionalModules/ViewerSupport/DynamicFloaterModule.cs
new file mode 100644
index 0000000..e76e8f2
--- /dev/null
+++ b/OpenSim/Region/OptionalModules/ViewerSupport/DynamicFloaterModule.cs
@@ -0,0 +1,238 @@
+/*
+ * 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.IO;
+using System.Reflection;
+using System.Text;
+using System.Collections.Generic;
+using OpenMetaverse;
+using OpenMetaverse.StructuredData;
+using OpenSim;
+using OpenSim.Region;
+using OpenSim.Region.Framework;
+using OpenSim.Region.Framework.Scenes;
+using OpenSim.Region.Framework.Interfaces;
+using OpenSim.Framework;
+using OpenSim.Framework.Servers;
+using OpenSim.Framework.Servers.HttpServer;
+using Nini.Config;
+using log4net;
+using Mono.Addins;
+using Caps = OpenSim.Framework.Capabilities.Caps;
+using OSDMap = OpenMetaverse.StructuredData.OSDMap;
+
+namespace OpenSim.Region.OptionalModules.ViewerSupport
+{
+    [Extension(Path = "/OpenSim/RegionModules", NodeName = "RegionModule", Id = "DynamicFloater")]
+    public class DynamicFloaterModule : INonSharedRegionModule, IDynamicFloaterModule
+    {
+        private static readonly ILog m_log = LogManager.GetLogger(MethodBase.GetCurrentMethod().DeclaringType);
+
+        private Scene m_scene;
+
+        private Dictionary<UUID, Dictionary<int, FloaterData>> m_floaters = new Dictionary<UUID, Dictionary<int, FloaterData>>();
+
+        public string Name
+        {
+            get { return "DynamicFloaterModule"; }
+        }
+
+        public Type ReplaceableInterface
+        {
+            get { return null; }
+        }
+
+        public void Initialise(IConfigSource config)
+        {
+        }
+
+        public void Close()
+        {
+        }
+
+        public void AddRegion(Scene scene)
+        {
+            m_scene = scene;
+            scene.EventManager.OnNewClient += OnNewClient;
+            scene.EventManager.OnClientClosed += OnClientClosed;
+            m_scene.RegisterModuleInterface<IDynamicFloaterModule>(this);
+        }
+
+        public void RegionLoaded(Scene scene)
+        {
+        }
+
+        public void RemoveRegion(Scene scene)
+        {
+        }
+
+        private void OnNewClient(IClientAPI client)
+        {
+            client.OnChatFromClient += OnChatFromClient;
+        }
+
+        private void OnClientClosed(UUID agentID, Scene scene)
+        {
+            m_floaters.Remove(agentID);
+        }
+
+        private void SendToClient(ScenePresence sp, string msg)
+        {
+            sp.ControllingClient.SendChatMessage(msg,
+                    (byte)ChatTypeEnum.Owner,
+                    sp.AbsolutePosition,
+                    "Server",
+                    UUID.Zero,
+                    UUID.Zero,
+                    (byte)ChatSourceType.Object,
+                    (byte)ChatAudibleLevel.Fully);
+        }
+
+        public void DoUserFloater(UUID agentID, FloaterData dialogData, string configuration)
+        {
+            ScenePresence sp = m_scene.GetScenePresence(agentID);
+            if (sp == null || sp.IsChildAgent)
+                return;
+
+            if (!m_floaters.ContainsKey(agentID))
+                m_floaters[agentID] = new Dictionary<int, FloaterData>();
+
+            if (m_floaters[agentID].ContainsKey(dialogData.Channel))
+                return;
+
+            m_floaters[agentID].Add(dialogData.Channel, dialogData);
+
+            string xml;
+            if (dialogData.XmlText != null && dialogData.XmlText != String.Empty)
+            {
+                xml = dialogData.XmlText;
+            }
+            else
+            {
+                using (FileStream fs = File.Open(dialogData.XmlName + ".xml", FileMode.Open))
+                {
+                    using (StreamReader sr = new StreamReader(fs))
+                        xml = sr.ReadToEnd().Replace("\n", "");
+                }
+            }
+
+            List<string> xparts = new List<string>();
+
+            while (xml.Length > 0)
+            {
+                string x = xml;
+                if (x.Length > 600)
+                {
+                    x = x.Substring(0, 600);
+                    xml = xml.Substring(600);
+                }
+                else
+                {
+                    xml = String.Empty;
+                }
+
+                xparts.Add(x);
+            }
+
+            for (int i = 0 ; i < xparts.Count ; i++)
+                SendToClient(sp, String.Format("># floater {2} create {0}/{1} " + xparts[i], i + 1, xparts.Count, dialogData.FloaterName));
+
+            SendToClient(sp, String.Format("># floater {0} {{notify:1}} {{channel: {1}}} {{node:cancel {{notify:1}}}} {{node:ok {{notify:1}}}} {2}", dialogData.FloaterName, (uint)dialogData.Channel, configuration));
+        }
+
+        private void OnChatFromClient(object sender, OSChatMessage msg)
+        {
+            if (msg.Sender == null)
+                return;
+
+            //m_log.DebugFormat("chan {0} msg {1}", msg.Channel, msg.Message);
+
+            IClientAPI client = msg.Sender;
+
+            if (!m_floaters.ContainsKey(client.AgentId))
+                return;
+
+            string[] parts = msg.Message.Split(new char[] {':'});
+            if (parts.Length == 0)
+                return;
+
+            ScenePresence sp = m_scene.GetScenePresence(client.AgentId);
+            if (sp == null || sp.IsChildAgent)
+                return;
+
+            Dictionary<int, FloaterData> d = m_floaters[client.AgentId];
+
+            // Work around a viewer bug - VALUE from any
+            // dialog can appear on this channel and needs to
+            // be dispatched to ALL open dialogs for the user
+            if (msg.Channel == 427169570)
+            {
+                if (parts[0] == "VALUE")
+                {
+                    foreach (FloaterData dd in d.Values)
+                    {
+                        if(dd.Handler(client, dd, parts))
+                        {
+                            m_floaters[client.AgentId].Remove(dd.Channel);
+                            SendToClient(sp, String.Format("># floater {0} destroy", dd.FloaterName));
+                            break;
+                        }
+                    }
+                }
+                return;
+            }
+
+            if (!d.ContainsKey(msg.Channel))
+                return;
+
+            FloaterData data = d[msg.Channel];
+
+            if (parts[0] == "NOTIFY")
+            {
+                if (parts[1] == "cancel" || parts[1] == data.FloaterName)
+                {
+                    m_floaters[client.AgentId].Remove(data.Channel);
+                    SendToClient(sp, String.Format("># floater {0} destroy", data.FloaterName));
+                }
+            }
+
+            if (data.Handler != null && data.Handler(client, data, parts))
+            {
+                m_floaters[client.AgentId].Remove(data.Channel);
+                SendToClient(sp, String.Format("># floater {0} destroy", data.FloaterName));
+            }
+        }
+
+        public void FloaterControl(ScenePresence sp, FloaterData d, string msg)
+        {
+            string sendData = String.Format("># floater {0} {1}", d.FloaterName, msg);
+            SendToClient(sp, sendData);
+
+        }
+    }
+}
diff --git a/OpenSim/Region/OptionalModules/ViewerSupport/DynamicMenuModule.cs b/OpenSim/Region/OptionalModules/ViewerSupport/DynamicMenuModule.cs
new file mode 100644
index 0000000..d37369c
--- /dev/null
+++ b/OpenSim/Region/OptionalModules/ViewerSupport/DynamicMenuModule.cs
@@ -0,0 +1,304 @@
+/*
+ * 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.IO;
+using System.Reflection;
+using System.Text;
+using System.Collections.Generic;
+using OpenMetaverse;
+using OpenMetaverse.StructuredData;
+using OpenSim;
+using OpenSim.Region;
+using OpenSim.Region.Framework;
+using OpenSim.Region.Framework.Scenes;
+using OpenSim.Region.Framework.Interfaces;
+using OpenSim.Framework;
+//using OpenSim.Framework.Capabilities;
+using OpenSim.Framework.Servers;
+using OpenSim.Framework.Servers.HttpServer;
+using Nini.Config;
+using log4net;
+using Mono.Addins;
+using Caps = OpenSim.Framework.Capabilities.Caps;
+using OSDMap = OpenMetaverse.StructuredData.OSDMap;
+
+namespace OpenSim.Region.OptionalModules.ViewerSupport
+{
+    [Extension(Path = "/OpenSim/RegionModules", NodeName = "RegionModule", Id = "DynamicMenu")]
+    public class DynamicMenuModule : INonSharedRegionModule, IDynamicMenuModule
+    {
+        private static readonly ILog m_log = LogManager.GetLogger(MethodBase.GetCurrentMethod().DeclaringType);
+
+        private class MenuItemData
+        {
+            public string Title;
+            public UUID AgentID;
+            public InsertLocation Location;
+            public UserMode Mode;
+            public CustomMenuHandler Handler;
+        }
+
+        private Dictionary<UUID, List<MenuItemData>> m_menuItems =
+                new Dictionary<UUID, List<MenuItemData>>();
+
+        private Scene m_scene;
+
+        public string Name
+        {
+            get { return "DynamicMenuModule"; }
+        }
+
+        public Type ReplaceableInterface
+        {
+            get { return null; }
+        }
+
+        public void Initialise(IConfigSource config)
+        {
+        }
+
+        public void Close()
+        {
+        }
+
+        public void AddRegion(Scene scene)
+        {
+            m_scene = scene;
+            scene.EventManager.OnRegisterCaps += OnRegisterCaps;
+            m_scene.RegisterModuleInterface<IDynamicMenuModule>(this);
+        }
+
+        public void RegionLoaded(Scene scene)
+        {
+            ISimulatorFeaturesModule featuresModule = m_scene.RequestModuleInterface<ISimulatorFeaturesModule>();
+
+            if (featuresModule != null)
+                featuresModule.OnSimulatorFeaturesRequest += OnSimulatorFeaturesRequest;
+        }
+
+        public void RemoveRegion(Scene scene)
+        {
+        }
+
+        private void OnSimulatorFeaturesRequest(UUID agentID, ref OSDMap features)
+        {
+            OSD menus = new OSDMap();
+            if (features.ContainsKey("menus"))
+                menus = features["menus"];
+
+            OSDMap agent = new OSDMap();
+            OSDMap world = new OSDMap();
+            OSDMap tools = new OSDMap();
+            OSDMap advanced = new OSDMap();
+            OSDMap admin = new OSDMap();
+            if (((OSDMap)menus).ContainsKey("agent"))
+                agent = (OSDMap)((OSDMap)menus)["agent"];
+            if (((OSDMap)menus).ContainsKey("world"))
+                world = (OSDMap)((OSDMap)menus)["world"];
+            if (((OSDMap)menus).ContainsKey("tools"))
+                tools = (OSDMap)((OSDMap)menus)["tools"];
+            if (((OSDMap)menus).ContainsKey("advanced"))
+                advanced = (OSDMap)((OSDMap)menus)["advanced"];
+            if (((OSDMap)menus).ContainsKey("admin"))
+                admin = (OSDMap)((OSDMap)menus)["admin"];
+
+            if (m_menuItems.ContainsKey(UUID.Zero))
+            {
+                foreach (MenuItemData d in m_menuItems[UUID.Zero])
+                {
+                    if (d.Mode == UserMode.God && (!m_scene.Permissions.IsGod(agentID)))
+                        continue;
+
+                    OSDMap loc = null;
+                    switch (d.Location)
+                    {
+                    case InsertLocation.Agent:
+                        loc = agent;
+                        break;
+                    case InsertLocation.World:
+                        loc = world;
+                        break;
+                    case InsertLocation.Tools:
+                        loc = tools;
+                        break;
+                    case InsertLocation.Advanced:
+                        loc = advanced;
+                        break;
+                    case InsertLocation.Admin:
+                        loc = admin;
+                        break;
+                    }
+
+                    if (loc == null)
+                        continue;
+                    
+                    loc[d.Title] = OSD.FromString(d.Title);
+                }
+            }
+
+            if (m_menuItems.ContainsKey(agentID))
+            {
+                foreach (MenuItemData d in m_menuItems[agentID])
+                {
+                    if (d.Mode == UserMode.God && (!m_scene.Permissions.IsGod(agentID)))
+                        continue;
+
+                    OSDMap loc = null;
+                    switch (d.Location)
+                    {
+                    case InsertLocation.Agent:
+                        loc = agent;
+                        break;
+                    case InsertLocation.World:
+                        loc = world;
+                        break;
+                    case InsertLocation.Tools:
+                        loc = tools;
+                        break;
+                    case InsertLocation.Advanced:
+                        loc = advanced;
+                        break;
+                    case InsertLocation.Admin:
+                        loc = admin;
+                        break;
+                    }
+
+                    if (loc == null)
+                        continue;
+                    
+                    loc[d.Title] = OSD.FromString(d.Title);
+                }
+            }
+
+
+            ((OSDMap)menus)["agent"] = agent;
+            ((OSDMap)menus)["world"] = world;
+            ((OSDMap)menus)["tools"] = tools;
+            ((OSDMap)menus)["advanced"] = advanced;
+            ((OSDMap)menus)["admin"] = admin;
+
+            features["menus"] = menus;
+        }
+
+        private void OnRegisterCaps(UUID agentID, Caps caps)
+        {
+            string capUrl = "/CAPS/" + UUID.Random() + "/";
+
+            capUrl = "/CAPS/" + UUID.Random() + "/";
+            caps.RegisterHandler("CustomMenuAction", new MenuActionHandler(capUrl, "CustomMenuAction", agentID, this, m_scene));
+        }
+
+        internal void HandleMenuSelection(string action, UUID agentID, List<uint> selection)
+        {
+            if (m_menuItems.ContainsKey(agentID))
+            {
+                foreach (MenuItemData d in m_menuItems[agentID])
+                {
+                    if (d.Title == action)
+                        d.Handler(action, agentID, selection);
+                }
+            }
+
+            if (m_menuItems.ContainsKey(UUID.Zero))
+            {
+                foreach (MenuItemData d in m_menuItems[UUID.Zero])
+                {
+                    if (d.Title == action)
+                        d.Handler(action, agentID, selection);
+                }
+            }
+        }
+
+        public void AddMenuItem(string title, InsertLocation location, UserMode mode, CustomMenuHandler handler)
+        {
+            AddMenuItem(UUID.Zero, title, location, mode, handler);
+        }
+
+        public void AddMenuItem(UUID agentID, string title, InsertLocation location, UserMode mode, CustomMenuHandler handler)
+        {
+            if (!m_menuItems.ContainsKey(agentID))
+                m_menuItems[agentID] = new List<MenuItemData>();
+
+            m_menuItems[agentID].Add(new MenuItemData() { Title = title, AgentID = agentID, Location = location, Mode = mode, Handler = handler });
+        }
+
+        public void RemoveMenuItem(string action)
+        {
+            foreach (KeyValuePair<UUID,List< MenuItemData>> kvp in m_menuItems)
+            {
+                List<MenuItemData> pendingDeletes = new List<MenuItemData>();
+                foreach (MenuItemData d in kvp.Value)
+                {
+                    if (d.Title == action)
+                        pendingDeletes.Add(d);
+                }
+
+                foreach (MenuItemData d in pendingDeletes)
+                    kvp.Value.Remove(d);
+            }
+        }
+    }
+
+    public class MenuActionHandler : BaseStreamHandler
+    {
+        private static readonly ILog m_log =
+            LogManager.GetLogger(MethodBase.GetCurrentMethod().DeclaringType);
+
+        private UUID m_agentID;
+        private Scene m_scene;
+        private DynamicMenuModule m_module;
+
+        public MenuActionHandler(string path, string name, UUID agentID, DynamicMenuModule module, Scene scene)
+                :base("POST", path, name, agentID.ToString())
+        {
+            m_agentID = agentID;
+            m_scene = scene;
+            m_module = module;
+        }
+
+        protected override byte[] ProcessRequest(string path, Stream request, IOSHttpRequest httpRequest, IOSHttpResponse httpResponse)
+        {
+            StreamReader reader = new StreamReader(request);
+            string requestBody = reader.ReadToEnd();
+
+            OSD osd = OSDParser.DeserializeLLSDXml(requestBody);
+
+            string action = ((OSDMap)osd)["action"].AsString();
+            OSDArray selection = (OSDArray)((OSDMap)osd)["selection"];
+            List<uint> sel = new List<uint>();
+            for (int i = 0 ; i < selection.Count ; i++)
+                sel.Add(selection[i].AsUInteger());
+
+            Util.FireAndForget(
+                x => { m_module.HandleMenuSelection(action, m_agentID, sel); }, null, "DynamicMenuModule.HandleMenuSelection");
+
+            Encoding encoding = Encoding.UTF8;
+            return encoding.GetBytes(OSDParser.SerializeLLSDXmlString(new OSD()));
+        }
+    }
+}
diff --git a/OpenSim/Region/OptionalModules/ViewerSupport/GodNamesModule.cs b/OpenSim/Region/OptionalModules/ViewerSupport/GodNamesModule.cs
new file mode 100644
index 0000000..e0537a4
--- /dev/null
+++ b/OpenSim/Region/OptionalModules/ViewerSupport/GodNamesModule.cs
@@ -0,0 +1,144 @@
+/*
+ * 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.Reflection;
+using log4net;
+using Mono.Addins;
+using Nini.Config;
+using OpenMetaverse;
+using OpenMetaverse.StructuredData;
+using OpenSim.Framework;
+using OpenSim.Region.Framework.Interfaces;
+using OpenSim.Region.Framework.Scenes;
+
+namespace OpenSim.Region.OptionalModules.ViewerSupport
+{
+    [Extension(Path = "/OpenSim/RegionModules", NodeName = "RegionModule", Id = "GodNamesModule")]
+    public class GodNamesModule : ISharedRegionModule
+    {
+        // Infrastructure
+        private static readonly ILog m_log = LogManager.GetLogger(MethodBase.GetCurrentMethod().DeclaringType);
+
+        // Configuration
+        private static bool m_enabled = false;
+        private static List<String> m_lastNames = new List<String>();
+        private static List<String> m_fullNames = new List<String>();
+
+        public void Initialise(IConfigSource config) 
+        {
+            IConfig moduleConfig = config.Configs["GodNames"];
+
+            if (moduleConfig == null) {
+                return;
+            }
+
+            if (!moduleConfig.GetBoolean("Enabled", false)) {
+                m_log.Info("[GODNAMES]: Addon is disabled");
+                return;
+            }
+
+            m_log.Info("[GODNAMES]: Enabled");
+            m_enabled = true;
+            string conf_str = moduleConfig.GetString("FullNames", String.Empty);
+            foreach (string strl in conf_str.Split(',')) {
+                string strlan = strl.Trim(" \t".ToCharArray());
+                m_log.DebugFormat("[GODNAMES]: Adding {0} as a God name", strlan);
+                m_fullNames.Add(strlan);
+            }
+
+            conf_str = moduleConfig.GetString("Surnames", String.Empty);
+            foreach (string strl in conf_str.Split(',')) {
+                string strlan = strl.Trim(" \t".ToCharArray());
+                m_log.DebugFormat("[GODNAMES]: Adding {0} as a God last name", strlan);
+                m_lastNames.Add(strlan);
+            }
+        }
+
+        public void AddRegion(Scene scene) {
+            /*no op*/
+        }
+
+        public void RemoveRegion(Scene scene) {
+            /*no op*/
+        }
+
+        public void PostInitialise() {
+            /*no op*/
+        }
+
+        public void Close() {
+            /*no op*/
+        }
+
+        public Type ReplaceableInterface {
+            get { return null; }
+        }
+
+        public string Name {
+            get { return "Godnames"; }
+        }
+
+        public bool IsSharedModule {
+            get { return true; }
+        }
+
+        public virtual void RegionLoaded(Scene scene)
+        {
+            if (!m_enabled)
+                return;
+
+            ISimulatorFeaturesModule featuresModule = scene.RequestModuleInterface<ISimulatorFeaturesModule>();
+
+            if (featuresModule != null)
+                featuresModule.OnSimulatorFeaturesRequest += OnSimulatorFeaturesRequest;
+
+        }
+
+        private void OnSimulatorFeaturesRequest(UUID agentID, ref OSDMap features)
+        {
+            OSD namesmap = new OSDMap();
+            if (features.ContainsKey("god_names"))
+                namesmap = features["god_names"];
+            else
+                features["god_names"] = namesmap;
+
+            OSDArray fnames = new OSDArray();
+            foreach (string name in m_fullNames) {
+                fnames.Add(name);
+            }
+            ((OSDMap)namesmap)["full_names"] = fnames;
+            
+            OSDArray lnames = new OSDArray();
+            foreach (string name in m_lastNames) {
+                lnames.Add(name);
+            }
+            ((OSDMap)namesmap)["last_names"] = lnames;
+        }
+    }
+}
diff --git a/OpenSim/Region/OptionalModules/ViewerSupport/SimulatorFeaturesHelper.cs b/OpenSim/Region/OptionalModules/ViewerSupport/SimulatorFeaturesHelper.cs
new file mode 100644
index 0000000..2661522
--- /dev/null
+++ b/OpenSim/Region/OptionalModules/ViewerSupport/SimulatorFeaturesHelper.cs
@@ -0,0 +1,171 @@
+/*
+ * 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.IO;
+using System.Reflection;
+using System.Text;
+using System.Collections.Generic;
+using System.Threading;
+
+using OpenMetaverse;
+using OpenMetaverse.StructuredData;
+using OpenSim;
+using OpenSim.Region;
+using OpenSim.Region.Framework;
+using OpenSim.Region.Framework.Scenes;
+using OpenSim.Region.Framework.Interfaces;
+using OpenSim.Framework;
+using OpenSim.Services.Interfaces;
+//using OpenSim.Framework.Capabilities;
+using Nini.Config;
+using log4net;
+using OSDMap = OpenMetaverse.StructuredData.OSDMap;
+using TeleportFlags = OpenSim.Framework.Constants.TeleportFlags;
+
+namespace OpenSim.Region.OptionalModules.ViewerSupport
+{
+    public class SimulatorFeaturesHelper 
+    {
+        private static readonly ILog m_log = LogManager.GetLogger(MethodBase.GetCurrentMethod().DeclaringType);
+
+        private IEntityTransferModule m_TransferModule;
+        private Scene m_scene;
+
+        private struct RegionSend {
+            public UUID region;
+            public bool send;
+        };
+        // Using a static cache so that we don't have to perform the time-consuming tests
+        // in ShouldSend on Extra SimFeatures that go on the same response but come from
+        // different modules.
+        // This cached is indexed on the agentID and maps to a list of regions
+        private static ExpiringCache<UUID, List<RegionSend>> m_Cache = new ExpiringCache<UUID, List<RegionSend>>();
+        private const double TIMEOUT = 1.0; // time in cache
+
+        public SimulatorFeaturesHelper(Scene scene, IEntityTransferModule et)
+        {
+            m_scene = scene;
+            m_TransferModule = et;
+        }
+
+        public bool ShouldSend(UUID agentID)
+        {
+            List<RegionSend> rsendlist;
+            RegionSend rsend;
+            if (m_Cache.TryGetValue(agentID, out rsendlist))
+            {
+                rsend = rsendlist.Find(r => r.region == m_scene.RegionInfo.RegionID);
+                if (rsend.region != UUID.Zero) // Found it
+                {
+                    return rsend.send;
+                }
+            }
+
+            // Relatively complex logic for deciding whether to send the extra SimFeature or not.
+            // This is because the viewer calls this cap to all sims that it knows about,
+            // including the departing sims and non-neighbors (those that are cached).
+            rsend.region = m_scene.RegionInfo.RegionID;
+            rsend.send = false;
+            IClientAPI client = null;
+            int counter = 200;
+
+            // Let's wait a little to see if we get a client here
+            while (!m_scene.TryGetClient(agentID, out client) && counter-- > 0)
+                Thread.Sleep(50);
+
+            if (client != null)
+            {
+                ScenePresence sp = WaitGetScenePresence(agentID);
+
+                if (sp != null)
+                {
+                    // On the receiving region, the call to this cap may arrive before
+                    // the agent is root. Make sure we only proceed from here when the agent
+                    // has been made root
+                    counter = 200;
+                    while ((sp.IsInTransit || sp.IsChildAgent) && counter-- > 0)
+                    {
+                        Thread.Sleep(50);
+                    }
+
+                    // The viewer calls this cap on the departing sims too. Make sure
+                    // that we only proceed after the agent is not in transit anymore.
+                    // The agent must be root and not going anywhere
+                    if (!sp.IsChildAgent && !m_TransferModule.IsInTransit(agentID))
+                        rsend.send = true;
+
+                }
+            }
+            //else
+            //    m_log.DebugFormat("[XXX]: client is null");
+
+
+            if (rsendlist == null)
+            {
+                rsendlist = new List<RegionSend>();
+                m_Cache.AddOrUpdate(agentID, rsendlist, TIMEOUT);
+            }
+            rsendlist.Add(rsend);
+
+            return rsend.send;
+        }
+
+        public int UserLevel(UUID agentID)
+        {
+            int level = 0;
+            UserAccount account = m_scene.UserAccountService.GetUserAccount(m_scene.RegionInfo.ScopeID, agentID);
+            if (account != null)
+                level = account.UserLevel;
+
+            return level;
+        }
+
+        protected virtual ScenePresence WaitGetScenePresence(UUID agentID)
+        {
+            int ntimes = 20;
+            ScenePresence sp = null;
+            while ((sp = m_scene.GetScenePresence(agentID)) == null && (ntimes-- > 0))
+                Thread.Sleep(1000);
+
+            if (sp == null)
+                m_log.WarnFormat(
+                    "[XXX]: Did not find presence with id {0} in {1} before timeout",
+                    agentID, m_scene.RegionInfo.RegionName);
+            else
+            {
+                ntimes = 10;
+                while (sp.IsInTransit && (ntimes-- > 0))
+                    Thread.Sleep(1000);
+            }
+
+            return sp;
+        }
+
+    }
+
+}
diff --git a/OpenSim/Region/OptionalModules/ViewerSupport/SpecialUIModule.cs b/OpenSim/Region/OptionalModules/ViewerSupport/SpecialUIModule.cs
new file mode 100644
index 0000000..3fe922d
--- /dev/null
+++ b/OpenSim/Region/OptionalModules/ViewerSupport/SpecialUIModule.cs
@@ -0,0 +1,165 @@
+/*
+ * 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.IO;
+using System.Reflection;
+using System.Text;
+using System.Collections.Generic;
+using System.Threading;
+using OpenMetaverse;
+using OpenMetaverse.StructuredData;
+using OpenSim;
+using OpenSim.Region;
+using OpenSim.Region.Framework;
+using OpenSim.Region.Framework.Scenes;
+using OpenSim.Region.Framework.Interfaces;
+using OpenSim.Framework;
+//using OpenSim.Framework.Capabilities;
+using OpenSim.Framework.Servers;
+using OpenSim.Framework.Servers.HttpServer;
+using Nini.Config;
+using log4net;
+using Mono.Addins;
+using OSDMap = OpenMetaverse.StructuredData.OSDMap;
+using TeleportFlags = OpenSim.Framework.Constants.TeleportFlags;
+
+namespace OpenSim.Region.OptionalModules.ViewerSupport
+{
+    [Extension(Path = "/OpenSim/RegionModules", NodeName = "RegionModule", Id = "SpecialUI")]
+    public class SpecialUIModule : INonSharedRegionModule
+    {
+        private static readonly ILog m_log = LogManager.GetLogger(MethodBase.GetCurrentMethod().DeclaringType);
+        private const string VIEWER_SUPPORT_DIR = "ViewerSupport";
+
+        private Scene m_scene;
+        private SimulatorFeaturesHelper m_Helper;
+        private bool m_Enabled;
+        private int m_UserLevel;
+
+        public string Name
+        {
+            get { return "SpecialUIModule"; }
+        }
+
+        public Type ReplaceableInterface
+        {
+            get { return null; }
+        }
+
+        public void Initialise(IConfigSource config)
+        {
+            IConfig moduleConfig = config.Configs["SpecialUIModule"];
+            if (moduleConfig != null)
+            {
+                m_Enabled = moduleConfig.GetBoolean("enabled", false);
+                if (m_Enabled)
+                {
+                    m_UserLevel = moduleConfig.GetInt("UserLevel", 0);
+                    m_log.Info("[SPECIAL UI]: SpecialUIModule enabled");
+                }
+
+            }
+        }
+
+        public void Close()
+        {
+        }
+
+        public void AddRegion(Scene scene)
+        {
+            if (m_Enabled)
+            {
+                m_scene = scene;
+            }
+        }
+
+        public void RegionLoaded(Scene scene)
+        {
+            if (m_Enabled)
+            {
+                IEntityTransferModule et = m_scene.RequestModuleInterface<IEntityTransferModule>();
+                m_Helper = new SimulatorFeaturesHelper(scene, et);
+
+                ISimulatorFeaturesModule featuresModule = m_scene.RequestModuleInterface<ISimulatorFeaturesModule>();
+                if (featuresModule != null)
+                    featuresModule.OnSimulatorFeaturesRequest += OnSimulatorFeaturesRequest;
+            }
+        }
+
+        public void RemoveRegion(Scene scene)
+        {
+        }
+
+        private void OnSimulatorFeaturesRequest(UUID agentID, ref OSDMap features)
+        {
+            m_log.DebugFormat("[SPECIAL UI]: OnSimulatorFeaturesRequest in {0}", m_scene.RegionInfo.RegionName);
+            if (m_Helper.ShouldSend(agentID) && m_Helper.UserLevel(agentID) <= m_UserLevel)
+            {
+                OSDMap extrasMap;
+                OSDMap specialUI = new OSDMap();
+                using (StreamReader s = new StreamReader(Path.Combine(VIEWER_SUPPORT_DIR, "panel_toolbar.xml")))
+                {
+                    if (features.ContainsKey("OpenSimExtras"))
+                        extrasMap = (OSDMap)features["OpenSimExtras"];
+                    else
+                    {
+                        extrasMap = new OSDMap();
+                        features["OpenSimExtras"] = extrasMap;
+                    }
+
+                    specialUI["toolbar"] = OSDMap.FromString(s.ReadToEnd());
+                    extrasMap["special-ui"] = specialUI;
+                }
+                m_log.DebugFormat("[SPECIAL UI]: Sending panel_toolbar.xml in {0}", m_scene.RegionInfo.RegionName);
+
+                if (Directory.Exists(Path.Combine(VIEWER_SUPPORT_DIR, "Floaters")))
+                {
+                    OSDMap floaters = new OSDMap();
+                    uint n = 0;
+                    foreach (String name in Directory.GetFiles(Path.Combine(VIEWER_SUPPORT_DIR, "Floaters"), "*.xml"))
+                    {
+                        using (StreamReader s = new StreamReader(name))
+                        {
+                            string simple_name = Path.GetFileNameWithoutExtension(name);
+                            OSDMap floater = new OSDMap();
+                            floaters[simple_name] = OSDMap.FromString(s.ReadToEnd());
+                            n++;
+                        }
+                    }
+                    specialUI["floaters"] = floaters;
+                    m_log.DebugFormat("[SPECIAL UI]: Sending {0} floaters", n);
+                }
+            }
+            else
+                m_log.DebugFormat("[SPECIAL UI]: NOT Sending panel_toolbar.xml in {0}", m_scene.RegionInfo.RegionName);
+
+        }
+
+    }
+
+}