7 files changed, 76 insertions, 23 deletions

diff --git a/OpenSim/Region/CoreModules/Asset/CenomeAssetCache.cs b/OpenSim/Region/CoreModules/Asset/CenomeAssetCache.cs
index 1903eb9..b1b7b27 100644
--- a/OpenSim/Region/CoreModules/Asset/CenomeAssetCache.cs
+++ b/OpenSim/Region/CoreModules/Asset/CenomeAssetCache.cs
@@ -330,7 +330,7 @@ namespace OpenSim.Region.CoreModules.Asset
             //m_log.DebugFormat("[XXX] name = {0} (this module's name: {1}", name, Name);
 
             if (name != Name)
-                return;           
+                return;
             
             long maxSize = DefaultMaxSize;
             int maxCount = DefaultMaxCount;
diff --git a/OpenSim/Region/CoreModules/Avatar/Combat/CombatModule.cs b/OpenSim/Region/CoreModules/Avatar/Combat/CombatModule.cs
index 61b6d65..4069991 100644
--- a/OpenSim/Region/CoreModules/Avatar/Combat/CombatModule.cs
+++ b/OpenSim/Region/CoreModules/Avatar/Combat/CombatModule.cs
@@ -148,13 +148,19 @@ namespace OpenSim.Region.CoreModules.Avatar.Combat.CombatModule
         private void AvatarEnteringParcel(ScenePresence avatar, int localLandID, UUID regionID)
         {
             ILandObject obj = avatar.Scene.LandChannel.GetLandObject(avatar.AbsolutePosition.X, avatar.AbsolutePosition.Y);
-            if ((obj.LandData.Flags & (uint)ParcelFlags.AllowDamage) != 0)
+            try
             {
-                avatar.Invulnerable = false;
+                if ((obj.LandData.Flags & (uint)ParcelFlags.AllowDamage) != 0)
+                {
+                    avatar.Invulnerable = false;
+                }
+                else
+                {
+                    avatar.Invulnerable = true;
+                }
             }
-            else
+            catch (Exception ex)
             {
-                avatar.Invulnerable = true;
             }
         }
     }
diff --git a/OpenSim/Region/CoreModules/ServiceConnectorsOut/Asset/LocalAssetServiceConnector.cs b/OpenSim/Region/CoreModules/ServiceConnectorsOut/Asset/LocalAssetServiceConnector.cs
index 2f21e6d..50348da 100644
--- a/OpenSim/Region/CoreModules/ServiceConnectorsOut/Asset/LocalAssetServiceConnector.cs
+++ b/OpenSim/Region/CoreModules/ServiceConnectorsOut/Asset/LocalAssetServiceConnector.cs
@@ -224,7 +224,7 @@ namespace OpenSim.Region.CoreModules.ServiceConnectorsOut.Asset
                     m_Cache.Cache(a);
 
 //                if (null == a)
-//                    m_log.WarnFormat("[LOCAL ASSET SERVICES CONNECTOR]: Could not asynchronously find asset with id {0}", id);                
+//                    m_log.WarnFormat("[LOCAL ASSET SERVICES CONNECTOR]: Could not asynchronously find asset with id {0}", id);
 
                 Util.FireAndForget(delegate { handler(assetID, s, a); });
             });
diff --git a/OpenSim/Region/CoreModules/World/Access/AccessModule.cs b/OpenSim/Region/CoreModules/World/Access/AccessModule.cs
index 73f7ae3..e4fe352 100644
--- a/OpenSim/Region/CoreModules/World/Access/AccessModule.cs
+++ b/OpenSim/Region/CoreModules/World/Access/AccessModule.cs
@@ -109,7 +109,7 @@ namespace OpenSim.Region.CoreModules.World
             {
                 foreach (Scene s in m_SceneList)
                 {
-                    if(!ProcessCommand(s, cmd))
+                    if (!ProcessCommand(s, cmd))
                         break;
                 }
             }
diff --git a/OpenSim/Region/CoreModules/World/Archiver/Tests/ArchiverTests.cs b/OpenSim/Region/CoreModules/World/Archiver/Tests/ArchiverTests.cs
index c3e57f0..e77a23b 100644
--- a/OpenSim/Region/CoreModules/World/Archiver/Tests/ArchiverTests.cs
+++ b/OpenSim/Region/CoreModules/World/Archiver/Tests/ArchiverTests.cs
@@ -99,7 +99,7 @@ namespace OpenSim.Region.CoreModules.World.Archiver.Tests
             Quaternion rotationOffset = new Quaternion(20, 30, 40, 50);
             Vector3 offsetPosition = new Vector3(5, 10, 15);
 
-            return new SceneObjectPart(ownerId, shape, groupPosition, rotationOffset, offsetPosition) { Name = partName };            
+            return new SceneObjectPart(ownerId, shape, groupPosition, rotationOffset, offsetPosition) { Name = partName };
         }
 
         protected SceneObjectPart CreateSceneObjectPart2()
@@ -112,7 +112,7 @@ namespace OpenSim.Region.CoreModules.World.Archiver.Tests
             Vector3 offsetPosition = new Vector3(20, 25, 30);
 
             return new SceneObjectPart(ownerId, shape, groupPosition, rotationOffset, offsetPosition) { Name = partName };
-        }        
+        }
 
         /// <summary>
         /// Test saving a V0.2 OpenSim Region Archive.
@@ -231,7 +231,7 @@ namespace OpenSim.Region.CoreModules.World.Archiver.Tests
             foreach (string name in names)
             {
                 if (name.EndsWith(".Resources.test-sound.wav"))
-                    soundDataResourceName = name;                
+                    soundDataResourceName = name;
             }
             Assert.That(soundDataResourceName, Is.Not.Null);
 
@@ -259,7 +259,7 @@ namespace OpenSim.Region.CoreModules.World.Archiver.Tests
                         = new TaskInventoryItem { AssetID = soundUuid, ItemID = soundItemUuid, Name = soundItemName };
                     part1.Inventory.AddInventoryItem(item1, true);
                 }
-            }            
+            }
             
             m_scene.AddNewSceneObject(object1, false);
 
@@ -306,15 +306,15 @@ namespace OpenSim.Region.CoreModules.World.Archiver.Tests
         /// Test loading the region settings of a V0.2 OpenSim Region Archive.
         /// </summary>
         [Test]
-        public void TestLoadOarV0_2RegionSettings()     
+        public void TestLoadOarV0_2RegionSettings()
         {
             TestHelper.InMethod();
-            //log4net.Config.XmlConfigurator.Configure();          
+            //log4net.Config.XmlConfigurator.Configure();
 
             MemoryStream archiveWriteStream = new MemoryStream();
             TarArchiveWriter tar = new TarArchiveWriter(archiveWriteStream);
             
-            tar.WriteDir(ArchiveConstants.TERRAINS_PATH);            
+            tar.WriteDir(ArchiveConstants.TERRAINS_PATH);
             tar.WriteFile(ArchiveConstants.CONTROL_FILE_PATH, ArchiveWriteRequestExecution.Create0p2ControlFile());
 
             RegionSettings rs = new RegionSettings();
@@ -329,11 +329,11 @@ namespace OpenSim.Region.CoreModules.World.Archiver.Tests
             rs.DisablePhysics = true;
             rs.DisableScripts = true;
             rs.Elevation1NW = 15.9;
-            rs.Elevation1NE = 45.3;            
+            rs.Elevation1NE = 45.3;
             rs.Elevation1SE = 49;
             rs.Elevation1SW = 1.9;
             rs.Elevation2NW = 4.5;
-            rs.Elevation2NE = 19.2;                                    
+            rs.Elevation2NE = 19.2;
             rs.Elevation2SE = 9.2;
             rs.Elevation2SW = 2.1;
             rs.FixedSun = true;
@@ -411,7 +411,7 @@ namespace OpenSim.Region.CoreModules.World.Archiver.Tests
 //            Quaternion part2RotationOffset = new Quaternion(60, 70, 80, 90);
 //            Vector3 part2OffsetPosition = new Vector3(20, 25, 30);
 
-            SceneObjectPart part2 = CreateSceneObjectPart2();            
+            SceneObjectPart part2 = CreateSceneObjectPart2();
 
             // Create an oar file that we can use for the merge
             {
@@ -420,9 +420,9 @@ namespace OpenSim.Region.CoreModules.World.Archiver.Tests
                 TerrainModule terrainModule = new TerrainModule();
 
                 Scene scene = SceneSetupHelpers.SetupScene();
-                SceneSetupHelpers.SetupSceneModules(scene, archiverModule, serialiserModule, terrainModule);               
+                SceneSetupHelpers.SetupSceneModules(scene, archiverModule, serialiserModule, terrainModule);
 
-                m_scene.AddNewSceneObject(new SceneObjectGroup(part2), false);                
+                m_scene.AddNewSceneObject(new SceneObjectGroup(part2), false);
 
                 // Write out this scene
                 scene.EventManager.OnOarFileSaved += SaveCompleted;
diff --git a/OpenSim/Region/CoreModules/World/Sound/SoundModule.cs b/OpenSim/Region/CoreModules/World/Sound/SoundModule.cs
index 37f1f2e..1f5a4ff 100644
--- a/OpenSim/Region/CoreModules/World/Sound/SoundModule.cs
+++ b/OpenSim/Region/CoreModules/World/Sound/SoundModule.cs
@@ -60,7 +60,7 @@ namespace OpenSim.Region.CoreModules.World.Sound
         }
         
         public virtual void PlayAttachedSound(
-            UUID soundID, UUID ownerID, UUID objectID, double gain, Vector3 position, byte flags)
+            UUID soundID, UUID ownerID, UUID objectID, double gain, Vector3 position, byte flags, float radius)
         {
             foreach (ScenePresence p in m_scene.GetAvatars())
             {
@@ -69,14 +69,17 @@ namespace OpenSim.Region.CoreModules.World.Sound
                     continue;
                 
                 // Scale by distance
-                gain = (float)((double)gain*((100.0 - dis) / 100.0));
+                if (radius == 0)
+                    gain = (float)((double)gain * ((100.0 - dis) / 100.0));
+                else
+                    gain = (float)((double)gain * ((radius - dis) / radius));
                 
                 p.ControllingClient.SendPlayAttachedSound(soundID, objectID, ownerID, (float)gain, flags);
             }
         }
         
         public virtual void TriggerSound(
-            UUID soundId, UUID ownerID, UUID objectID, UUID parentID, double gain, Vector3 position, UInt64 handle)
+            UUID soundId, UUID ownerID, UUID objectID, UUID parentID, double gain, Vector3 position, UInt64 handle, float radius)
         {
             foreach (ScenePresence p in m_scene.GetAvatars())
             {
@@ -85,7 +88,10 @@ namespace OpenSim.Region.CoreModules.World.Sound
                     continue;
                 
                 // Scale by distance
-                gain = (float)((double)gain*((100.0 - dis) / 100.0));
+                if (radius == 0)
+                    gain = (float)((double)gain * ((100.0 - dis) / 100.0));
+                else
+                    gain = (float)((double)gain * ((radius - dis) / radius));
                 
                 p.ControllingClient.SendTriggeredSound(
                     soundId, ownerID, objectID, parentID, handle, position, (float)gain);
diff --git a/OpenSim/Region/CoreModules/World/Terrain/TerrainModule.cs b/OpenSim/Region/CoreModules/World/Terrain/TerrainModule.cs
index a40828b..1e7ea7b 100644
--- a/OpenSim/Region/CoreModules/World/Terrain/TerrainModule.cs
+++ b/OpenSim/Region/CoreModules/World/Terrain/TerrainModule.cs
@@ -84,6 +84,7 @@ namespace OpenSim.Region.CoreModules.World.Terrain
         private ITerrainChannel m_revert;
         private Scene m_scene;
         private volatile bool m_tainted;
+        private readonly UndoStack<LandUndoState> m_undo = new UndoStack<LandUndoState>(5);
 
         #region ICommandableModule Members
 
@@ -174,6 +175,11 @@ namespace OpenSim.Region.CoreModules.World.Terrain
 
         #region ITerrainModule Members
 
+        public void UndoTerrain(ITerrainChannel channel)
+        {
+            m_channel = channel;
+        }
+
         /// <summary>
         /// Loads a terrain file from disk and installs it in the scene.
         /// </summary>
@@ -574,6 +580,7 @@ namespace OpenSim.Region.CoreModules.World.Terrain
         {
             client.OnModifyTerrain += client_OnModifyTerrain;
             client.OnBakeTerrain += client_OnBakeTerrain;
+            client.OnLandUndo += client_OnLandUndo;
         }
 
         /// <summary>
@@ -664,6 +671,19 @@ namespace OpenSim.Region.CoreModules.World.Terrain
             return changesLimited;
         }
 
+        private void client_OnLandUndo(IClientAPI client)
+        {
+            lock (m_undo)
+            {
+                if (m_undo.Count > 0)
+                {
+                    LandUndoState goback = m_undo.Pop();
+                    if (goback != null)
+                        goback.PlaybackState();
+                }
+            }
+        }
+
         /// <summary>
         /// Sends a copy of the current terrain to the scenes clients
         /// </summary>
@@ -718,6 +738,7 @@ namespace OpenSim.Region.CoreModules.World.Terrain
                     }
                     if (allowed)
                     {
+                        StoreUndoState();
                         m_painteffects[(StandardTerrainEffects) action].PaintEffect(
                             m_channel, allowMask, west, south, height, size, seconds);
 
@@ -758,6 +779,7 @@ namespace OpenSim.Region.CoreModules.World.Terrain
 
                     if (allowed)
                     {
+                        StoreUndoState();
                         m_floodeffects[(StandardTerrainEffects) action].FloodEffect(
                             m_channel, fillArea, size);
 
@@ -782,6 +804,25 @@ namespace OpenSim.Region.CoreModules.World.Terrain
             }
         }
 
+        private void StoreUndoState()
+        {
+            lock (m_undo)
+            {
+                if (m_undo.Count > 0)
+                {
+                    LandUndoState last = m_undo.Peek();
+                    if (last != null)
+                    {
+                        if (last.Compare(m_channel))
+                            return;
+                    }
+                }
+
+                LandUndoState nUndo = new LandUndoState(this, m_channel);
+                m_undo.Push(nUndo);
+            }
+        }
+
         #region Console Commands
 
         private void InterfaceLoadFile(Object[] args)