* Added time dilation property to Scene

* Default Terrain algorithm now produces something slightly less mountainous.
* Fixed lolcat

3 files changed, 15 insertions, 0 deletions

diff --git a/OpenSim/Region/Environment/Scenes/Scene.cs b/OpenSim/Region/Environment/Scenes/Scene.cs
index fbda669..5849519 100644
--- a/OpenSim/Region/Environment/Scenes/Scene.cs
+++ b/OpenSim/Region/Environment/Scenes/Scene.cs
@@ -100,6 +100,8 @@ namespace OpenSim.Region.Environment.Scenes
         protected float m_timespan = 0.1f;
         protected DateTime m_lastupdate = DateTime.Now;
 
+        protected float m_timedilation = 1.0f;
+
         private int m_update_physics = 1;
         private int m_update_entitymovement = 1;
         private int m_update_entities = 1;
@@ -307,6 +309,8 @@ namespace OpenSim.Region.Environment.Scenes
             finally
             {
                 updateLock.ReleaseMutex();
+
+                m_timedilation = m_timespan / (float)SinceLastFrame.TotalSeconds;
                 m_lastupdate = DateTime.Now;
             }
         }
diff --git a/OpenSim/Region/Terrain.BasicTerrain/TerrainEngine.cs b/OpenSim/Region/Terrain.BasicTerrain/TerrainEngine.cs
index fe6eefb..6454bdc 100644
--- a/OpenSim/Region/Terrain.BasicTerrain/TerrainEngine.cs
+++ b/OpenSim/Region/Terrain.BasicTerrain/TerrainEngine.cs
@@ -1128,6 +1128,10 @@ namespace OpenSim.Region.Terrain
                 heightmap.HillsSpheres(200, 20, 40, true, true, false);
                 heightmap.Normalise();
                 heightmap *= 60.0; // Raise to 60m
+                heightmap.Clip(0.0, 25.0);
+                heightmap.Pertubation(2.5);
+                heightmap.Smooth(35.0);
+                heightmap.Normalise(0.0, 21.0);
             }
 
             tainted++;
diff --git a/bin/OpenSimAssetSet.xml b/bin/OpenSimAssetSet.xml
index 926de11..ede5d30 100644
--- a/bin/OpenSimAssetSet.xml
+++ b/bin/OpenSimAssetSet.xml
@@ -328,4 +328,11 @@
         <Key Name="inventoryType" Value="0" />

         <Key Name="fileName" Value="wood1.jp2" />

     </Section>

+    <Section Name="LOLCAT">

+        <Key Name="assetID" Value="13371337-1337-1337-1337-133713371337" />

+        <Key Name="name" Value="lolcat in ur assets" />

+        <Key Name="assetType" Value="0" />

+        <Key Name="inventoryType" Value="0" />

+        <Key Name="fileName" Value="peaches.jp2" />

+    </Section>

 </Nini>
\ No newline at end of file