Merge branch 'master' into careminster-presence-refactor

3 files changed, 78 insertions, 50 deletions

diff --git a/OpenSim/Region/CoreModules/World/Archiver/AssetsRequest.cs b/OpenSim/Region/CoreModules/World/Archiver/AssetsRequest.cs
index 5da1656..eb00de8 100644
--- a/OpenSim/Region/CoreModules/World/Archiver/AssetsRequest.cs
+++ b/OpenSim/Region/CoreModules/World/Archiver/AssetsRequest.cs
@@ -230,6 +230,8 @@ namespace OpenSim.Region.CoreModules.World.Archiver
         /// <param name="asset"></param>
         public void AssetRequestCallback(string id, object sender, AssetBase asset)
         {
+            Culture.SetCurrentCulture();
+            
             try
             {
                 lock (this)
@@ -289,6 +291,8 @@ namespace OpenSim.Region.CoreModules.World.Archiver
         /// </summary>
         protected void PerformAssetsRequestCallback(object o)
         {
+            Culture.SetCurrentCulture();
+
             try
             {
                 m_assetsRequestCallback(m_foundAssetUuids, m_notFoundAssetUuids);
diff --git a/OpenSim/Region/CoreModules/World/Permissions/PermissionsModule.cs b/OpenSim/Region/CoreModules/World/Permissions/PermissionsModule.cs
index a098ff6..43b37c7 100644
--- a/OpenSim/Region/CoreModules/World/Permissions/PermissionsModule.cs
+++ b/OpenSim/Region/CoreModules/World/Permissions/PermissionsModule.cs
@@ -548,18 +548,18 @@ namespace OpenSim.Region.CoreModules.World.Permissions
 
             // libomv will moan about PrimFlags.ObjectYouOfficer being
             // deprecated
-            #pragma warning disable 0612 
+#pragma warning disable 0612
             objflags &= (uint)
                 ~(PrimFlags.ObjectCopy | // Tells client you can copy the object
-                  PrimFlags.ObjectModify | // tells client you can modify the object
-                  PrimFlags.ObjectMove |   // tells client that you can move the object (only, no mod)
-                  PrimFlags.ObjectTransfer | // tells the client that you can /take/ the object if you don't own it
-                  PrimFlags.ObjectYouOwner | // Tells client that you're the owner of the object
-                  PrimFlags.ObjectAnyOwner | // Tells client that someone owns the object
-                  PrimFlags.ObjectOwnerModify | // Tells client that you're the owner of the object
-                  PrimFlags.ObjectYouOfficer // Tells client that you've got group object editing permission. Used when ObjectGroupOwned is set
+                    PrimFlags.ObjectModify | // tells client you can modify the object
+                    PrimFlags.ObjectMove |   // tells client that you can move the object (only, no mod)
+                    PrimFlags.ObjectTransfer | // tells the client that you can /take/ the object if you don't own it
+                    PrimFlags.ObjectYouOwner | // Tells client that you're the owner of the object
+                    PrimFlags.ObjectAnyOwner | // Tells client that someone owns the object
+                    PrimFlags.ObjectOwnerModify | // Tells client that you're the owner of the object
+                    PrimFlags.ObjectYouOfficer // Tells client that you've got group object editing permission. Used when ObjectGroupOwned is set
                     );
-            #pragma warning restore 0612
+#pragma warning restore 0612
 
             // Creating the three ObjectFlags options for this method to choose from.
             // Customize the OwnerMask
@@ -576,22 +576,27 @@ namespace OpenSim.Region.CoreModules.World.Permissions
 
             if (m_bypassPermissions)
                 return objectOwnerMask;
-        
+
             // Object owners should be able to edit their own content
             if (user == objectOwner)
                 return objectOwnerMask;
-            
+
             if (IsFriendWithPerms(user, objectOwner))
+            {
                 return objectOwnerMask;
-
+            }
             // Estate users should be able to edit anything in the sim if RegionOwnerIsGod is set
             if (m_RegionOwnerIsGod && IsEstateManager(user) && !IsAdministrator(objectOwner))
+            {
                 return objectOwnerMask;
+            }
 
             // Admin should be able to edit anything in the sim (including admin objects)
             if (IsAdministrator(user))
+            {
                 return objectOwnerMask;
-            
+            }
+
             // Users should be able to edit what is over their land.
             Vector3 taskPos = task.AbsolutePosition;
             ILandObject parcel = m_scene.LandChannel.GetLandObject(taskPos.X, taskPos.Y);
@@ -599,13 +604,15 @@ namespace OpenSim.Region.CoreModules.World.Permissions
             {
                 // Admin objects should not be editable by the above
                 if (!IsAdministrator(objectOwner))
+                {
                     return objectOwnerMask;
+                }
             }
 
             // Group permissions
             if ((task.GroupID != UUID.Zero) && IsGroupMember(task.GroupID, user, 0))
                 return objectGroupMask | objectEveryoneMask;
-        
+
             return objectEveryoneMask;
         }
 
@@ -673,7 +680,6 @@ namespace OpenSim.Region.CoreModules.World.Permissions
             //
             // Nobody but the object owner can set permissions on an object
             //
-
             if (locked && (!IsAdministrator(currentUser)) && denyOnLocked)
             {
                 return false;
@@ -704,6 +710,11 @@ namespace OpenSim.Region.CoreModules.World.Permissions
                 // Return immediately, so that the administrator can shares group objects
                 return true;
             }
+
+            // Friends with benefits should be able to edit the objects too
+            if (IsFriendWithPerms(currentUser, objectOwner))
+                // Return immediately, so that the administrator can share objects with friends
+                return true;
         
             // Users should be able to edit what is over their land.
             ILandObject parcel = m_scene.LandChannel.GetLandObject(group.AbsolutePosition.X, group.AbsolutePosition.Y);
diff --git a/OpenSim/Region/CoreModules/World/WorldMap/WorldMapModule.cs b/OpenSim/Region/CoreModules/World/WorldMap/WorldMapModule.cs
index cd40c5d..3f6f359 100644
--- a/OpenSim/Region/CoreModules/World/WorldMap/WorldMapModule.cs
+++ b/OpenSim/Region/CoreModules/World/WorldMap/WorldMapModule.cs
@@ -208,52 +208,65 @@ namespace OpenSim.Region.CoreModules.World.WorldMap
             //m_log.DebugFormat("[MAPLAYER]: path: {0}, param: {1}, agent:{2}",
             //                  path, param, agentID.ToString());
 
-            // this is here because CAPS map requests work even beyond the 10,000 limit.
-            ScenePresence avatarPresence = null;
-
-            m_scene.TryGetScenePresence(agentID, out avatarPresence);
-
-            if (avatarPresence != null)
+            // There is a major hack going on in this method. The viewer doesn't request
+            // map blocks (RequestMapBlocks) above 4096. That means that if we don't hack,
+            // grids above that cell don't have a map at all. So, here's the hack: we wait
+            // for this CAP request to come, and we inject the map blocks at this point. 
+            // In a normal scenario, this request simply sends back the MapLayer (the blue color).
+            // In the hacked scenario, it also sends the map blocks via UDP.
+            //
+            // 6/8/2011 -- I'm adding an explicit 4096 check, so that we never forget that there is
+            // a hack here, and so that regions below 4096 don't get spammed with unnecessary map blocks.
+
+            if (m_scene.RegionInfo.RegionLocX >= 4096 || m_scene.RegionInfo.RegionLocY >= 4096)
             {
-                bool lookup = false;
+                ScenePresence avatarPresence = null;
 
-                lock (cachedMapBlocks)
-                {
-                    if (cachedMapBlocks.Count > 0 && ((cachedTime + 1800) > Util.UnixTimeSinceEpoch()))
-                    {
-                        List<MapBlockData> mapBlocks;
+                m_scene.TryGetScenePresence(agentID, out avatarPresence);
 
-                        mapBlocks = cachedMapBlocks;
-                        avatarPresence.ControllingClient.SendMapBlock(mapBlocks, 0);
-                    }
-                    else
-                    {
-                        lookup = true;
-                    }
-                }
-                if (lookup)
+                if (avatarPresence != null)
                 {
-                    List<MapBlockData> mapBlocks = new List<MapBlockData>(); ;
+                    bool lookup = false;
 
-                    List<GridRegion> regions = m_scene.GridService.GetRegionRange(m_scene.RegionInfo.ScopeID,
-                        (int)(m_scene.RegionInfo.RegionLocX - 8) * (int)Constants.RegionSize,
-                        (int)(m_scene.RegionInfo.RegionLocX + 8) * (int)Constants.RegionSize,
-                        (int)(m_scene.RegionInfo.RegionLocY - 8) * (int)Constants.RegionSize,
-                        (int)(m_scene.RegionInfo.RegionLocY + 8) * (int)Constants.RegionSize);
-                    foreach (GridRegion r in regions)
+                    lock (cachedMapBlocks)
                     {
-                        MapBlockData block = new MapBlockData();
-                        MapBlockFromGridRegion(block, r);
-                        mapBlocks.Add(block);
+                        if (cachedMapBlocks.Count > 0 && ((cachedTime + 1800) > Util.UnixTimeSinceEpoch()))
+                        {
+                            List<MapBlockData> mapBlocks;
+
+                            mapBlocks = cachedMapBlocks;
+                            avatarPresence.ControllingClient.SendMapBlock(mapBlocks, 0);
+                        }
+                        else
+                        {
+                            lookup = true;
+                        }
                     }
-                    avatarPresence.ControllingClient.SendMapBlock(mapBlocks, 0);
+                    if (lookup)
+                    {
+                        List<MapBlockData> mapBlocks = new List<MapBlockData>(); ;
+
+                        List<GridRegion> regions = m_scene.GridService.GetRegionRange(m_scene.RegionInfo.ScopeID,
+                            (int)(m_scene.RegionInfo.RegionLocX - 8) * (int)Constants.RegionSize,
+                            (int)(m_scene.RegionInfo.RegionLocX + 8) * (int)Constants.RegionSize,
+                            (int)(m_scene.RegionInfo.RegionLocY - 8) * (int)Constants.RegionSize,
+                            (int)(m_scene.RegionInfo.RegionLocY + 8) * (int)Constants.RegionSize);
+                        foreach (GridRegion r in regions)
+                        {
+                            MapBlockData block = new MapBlockData();
+                            MapBlockFromGridRegion(block, r);
+                            mapBlocks.Add(block);
+                        }
+                        avatarPresence.ControllingClient.SendMapBlock(mapBlocks, 0);
 
-                    lock (cachedMapBlocks)
-                        cachedMapBlocks = mapBlocks;
+                        lock (cachedMapBlocks)
+                            cachedMapBlocks = mapBlocks;
 
-                    cachedTime = Util.UnixTimeSinceEpoch();
+                        cachedTime = Util.UnixTimeSinceEpoch();
+                    }
                 }
             }
+
             LLSDMapLayerResponse mapResponse = new LLSDMapLayerResponse();
             mapResponse.LayerData.Array.Add(GetOSDMapLayerResponse());
             return mapResponse.ToString();