Imported fixed OGS asset server

Fiddled with terrain data

4 files changed, 12 insertions, 11 deletions

diff --git a/ogs/assetserver/assetserver_config.inc.php b/ogs/assetserver/assetserver_config.inc.php
index 529a4f7..b2199f3 100644
--- a/ogs/assetserver/assetserver_config.inc.php
+++ b/ogs/assetserver/assetserver_config.inc.php
@@ -4,13 +4,13 @@
 // The asset server's relative URL to the root of the webserver
 // If you place this at http://servername/assets then this would be set to /assets/index.php
 // wikipedia style URLs need to be implemented - and will be (en.wikipedia.org/wiki/blabla rather than en.wikipedia.org/wiki/index.php?something=bla or en.wikipedia.org/wiki.php/bla)
-$asset_home = "/ogs/assetserver/index.php/";
+$asset_home = "/ogs/assetserver/";
 
 // The key we expect from sims
-$sim_recvkey = "rtrgrgrgrgr894898f998re98rf989fds";
+$sim_recvkey = "1234";
 
 // The path where the asset repository is stored, this should be readable by the webserver but NOT in the document root
 // The default below is BAD for production use and intended to be simply generic - change it or risk copyright theft 
 // greater than you could ever imagine, alternatively use .htaccess or other mechanisms.
-$asset_repos = "/var/www/htdocs/ogs/assetserver/assets";
-?>
\ No newline at end of file
+$asset_repos = "/usr/local/sites/osgrid.org/web/ogs/assetserver/assets";
+?>
diff --git a/ogs/assetserver/index.php b/ogs/assetserver/index.php
index 82cf9d4..ee20229 100644
--- a/ogs/assetserver/index.php
+++ b/ogs/assetserver/index.php
@@ -5,6 +5,7 @@ include("assetserver_config.inc.php");
 
 // Parse out the parameters from the URL
 $params = str_replace($asset_home,'', $_SERVER['REQUEST_URI']);
+$params = str_replace("index.php/","",$params);
 $params = split('/',$params);
 
 // Die if the key doesn't match
@@ -21,4 +22,4 @@ switch($params[0]) {
         }
     break;
 }
-?>
\ No newline at end of file
+?>
diff --git a/src/world/Avatar.cs b/src/world/Avatar.cs
index d579463..b81fd0b 100644
--- a/src/world/Avatar.cs
+++ b/src/world/Avatar.cs
@@ -125,12 +125,12 @@ namespace OpenSim.world
                 handshake.RegionInfo.TerrainHeightRange01 = 60;

                 handshake.RegionInfo.TerrainHeightRange10 = 60;

                 handshake.RegionInfo.TerrainHeightRange11 = 60;

-                handshake.RegionInfo.TerrainStartHeight00 = 20;

-                handshake.RegionInfo.TerrainStartHeight01 = 20;

-                handshake.RegionInfo.TerrainStartHeight10 = 20;

-                handshake.RegionInfo.TerrainStartHeight11 = 20;

+                handshake.RegionInfo.TerrainStartHeight00 = 10;

+                handshake.RegionInfo.TerrainStartHeight01 = 10;

+                handshake.RegionInfo.TerrainStartHeight10 = 10;

+                handshake.RegionInfo.TerrainStartHeight11 = 10;

                 handshake.RegionInfo.SimAccess = 13;

-                handshake.RegionInfo.WaterHeight = 10;

+                handshake.RegionInfo.WaterHeight = 5;

                 handshake.RegionInfo.RegionFlags = 72458694;

                 handshake.RegionInfo.SimName = _enc.GetBytes(OpenSim_Main.cfg.RegionName + "\0");

                 handshake.RegionInfo.SimOwner = new LLUUID("00000000-0000-0000-0000-000000000000");

diff --git a/src/world/World.cs b/src/world/World.cs
index ccc34ea..854e8fe 100644
--- a/src/world/World.cs
+++ b/src/world/World.cs
@@ -24,7 +24,7 @@ namespace OpenSim.world
                 terrainengine = new TerrainDecode();

                 LandMap = new float[65536];

                 for(int i =0; i < 65536; i++) {

-                       LandMap[i] =  30.4989f;

+                       LandMap[i] =  40f;

                 }