6 files changed, 17 insertions, 114 deletions

diff --git a/OpenSim/Region/OptionalModules/ViewerSupport/CameraOnlyModeModule.cs b/OpenSim/Region/OptionalModules/ViewerSupport/CameraOnlyModeModule.cs
index 7ae4223..54f3ab6 100644
--- a/OpenSim/Region/OptionalModules/ViewerSupport/CameraOnlyModeModule.cs
+++ b/OpenSim/Region/OptionalModules/ViewerSupport/CameraOnlyModeModule.cs
@@ -108,8 +108,7 @@ namespace OpenSim.Region.OptionalModules.ViewerSupport
         {
             if (m_Enabled)
             {
-                IEntityTransferModule et = m_scene.RequestModuleInterface<IEntityTransferModule>();
-                m_Helper = new SimulatorFeaturesHelper(scene, et);
+                m_Helper = new SimulatorFeaturesHelper(scene);
 
                 ISimulatorFeaturesModule featuresModule = m_scene.RequestModuleInterface<ISimulatorFeaturesModule>();
                 if (featuresModule != null)
@@ -124,7 +123,7 @@ namespace OpenSim.Region.OptionalModules.ViewerSupport
         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)
+            if (m_Helper.UserLevel(agentID) <= m_UserLevel)
             {
                 OSDMap extrasMap;
                 if (features.ContainsKey("OpenSimExtras"))
@@ -162,7 +161,7 @@ namespace OpenSim.Region.OptionalModules.ViewerSupport
                 {
                     foreach (SceneObjectGroup sog in attachs)
                     {
-                        m_log.DebugFormat("[CAMERA-ONLY MODE]: Forcibly detaching attach {0} from {1} in {2}", 
+                        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
index e76e8f2..ed44a5a 100644
--- a/OpenSim/Region/OptionalModules/ViewerSupport/DynamicFloaterModule.cs
+++ b/OpenSim/Region/OptionalModules/ViewerSupport/DynamicFloaterModule.cs
@@ -134,7 +134,7 @@ namespace OpenSim.Region.OptionalModules.ViewerSupport
             }
             else
             {
-                using (FileStream fs = File.Open(dialogData.XmlName + ".xml", FileMode.Open))
+                using (FileStream fs = File.Open(dialogData.XmlName + ".xml", FileMode.Open, FileAccess.Read))
                 {
                     using (StreamReader sr = new StreamReader(fs))
                         xml = sr.ReadToEnd().Replace("\n", "");
diff --git a/OpenSim/Region/OptionalModules/ViewerSupport/DynamicMenuModule.cs b/OpenSim/Region/OptionalModules/ViewerSupport/DynamicMenuModule.cs
index d37369c..9833086 100644
--- a/OpenSim/Region/OptionalModules/ViewerSupport/DynamicMenuModule.cs
+++ b/OpenSim/Region/OptionalModules/ViewerSupport/DynamicMenuModule.cs
@@ -131,8 +131,11 @@ namespace OpenSim.Region.OptionalModules.ViewerSupport
             {
                 foreach (MenuItemData d in m_menuItems[UUID.Zero])
                 {
-                    if (d.Mode == UserMode.God && (!m_scene.Permissions.IsGod(agentID)))
-                        continue;
+                    if (!m_scene.Permissions.IsGod(agentID))
+                    {
+                        if (d.Mode == UserMode.RegionManager && (!m_scene.Permissions.IsAdministrator(agentID)))
+                            continue;
+                    }
 
                     OSDMap loc = null;
                     switch (d.Location)
@@ -156,7 +159,7 @@ namespace OpenSim.Region.OptionalModules.ViewerSupport
 
                     if (loc == null)
                         continue;
-                    
+
                     loc[d.Title] = OSD.FromString(d.Title);
                 }
             }
@@ -190,7 +193,7 @@ namespace OpenSim.Region.OptionalModules.ViewerSupport
 
                     if (loc == null)
                         continue;
-                    
+
                     loc[d.Title] = OSD.FromString(d.Title);
                 }
             }
diff --git a/OpenSim/Region/OptionalModules/ViewerSupport/GodNamesModule.cs b/OpenSim/Region/OptionalModules/ViewerSupport/GodNamesModule.cs
index e0537a4..8ed0bb3 100644
--- a/OpenSim/Region/OptionalModules/ViewerSupport/GodNamesModule.cs
+++ b/OpenSim/Region/OptionalModules/ViewerSupport/GodNamesModule.cs
@@ -50,7 +50,7 @@ namespace OpenSim.Region.OptionalModules.ViewerSupport
         private static List<String> m_lastNames = new List<String>();
         private static List<String> m_fullNames = new List<String>();
 
-        public void Initialise(IConfigSource config) 
+        public void Initialise(IConfigSource config)
         {
             IConfig moduleConfig = config.Configs["GodNames"];
 
@@ -133,7 +133,7 @@ namespace OpenSim.Region.OptionalModules.ViewerSupport
                 fnames.Add(name);
             }
             ((OSDMap)namesmap)["full_names"] = fnames;
-            
+
             OSDArray lnames = new OSDArray();
             foreach (string name in m_lastNames) {
                 lnames.Add(name);
diff --git a/OpenSim/Region/OptionalModules/ViewerSupport/SimulatorFeaturesHelper.cs b/OpenSim/Region/OptionalModules/ViewerSupport/SimulatorFeaturesHelper.cs
index 2661522..2c2042d 100644
--- a/OpenSim/Region/OptionalModules/ViewerSupport/SimulatorFeaturesHelper.cs
+++ b/OpenSim/Region/OptionalModules/ViewerSupport/SimulatorFeaturesHelper.cs
@@ -49,90 +49,15 @@ using TeleportFlags = OpenSim.Framework.Constants.TeleportFlags;
 
 namespace OpenSim.Region.OptionalModules.ViewerSupport
 {
-    public class SimulatorFeaturesHelper 
+    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)
+        public SimulatorFeaturesHelper(Scene scene)
         {
             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)
@@ -144,28 +69,5 @@ namespace OpenSim.Region.OptionalModules.ViewerSupport
 
             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
index 3fe922d..fa8fc66 100644
--- a/OpenSim/Region/OptionalModules/ViewerSupport/SpecialUIModule.cs
+++ b/OpenSim/Region/OptionalModules/ViewerSupport/SpecialUIModule.cs
@@ -102,8 +102,7 @@ namespace OpenSim.Region.OptionalModules.ViewerSupport
         {
             if (m_Enabled)
             {
-                IEntityTransferModule et = m_scene.RequestModuleInterface<IEntityTransferModule>();
-                m_Helper = new SimulatorFeaturesHelper(scene, et);
+                m_Helper = new SimulatorFeaturesHelper(scene);
 
                 ISimulatorFeaturesModule featuresModule = m_scene.RequestModuleInterface<ISimulatorFeaturesModule>();
                 if (featuresModule != null)
@@ -118,7 +117,7 @@ namespace OpenSim.Region.OptionalModules.ViewerSupport
         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)
+            if (m_Helper.UserLevel(agentID) <= m_UserLevel)
             {
                 OSDMap extrasMap;
                 OSDMap specialUI = new OSDMap();