OpenSim
/
OpenSimMirror
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Imported fixed OGS asset server 

Fiddled with terrain data
brokenplugins
gareth 2007-03-01 02:26:44 +00:00
parent 1122aa3efe
commit ba299f4e10
4 changed files with 12 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
ogs/assetserver/assetserver_config.inc.php
View File

@ -4,13 +4,13 @@
// The asset server's relative URL to the root of the webserver // 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 // 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) // 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 // 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 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 // 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. // greater than you could ever imagine, alternatively use .htaccess or other mechanisms.
$asset_repos = "/var/www/htdocs/ogs/assetserver/assets"; $asset_repos = "/usr/local/sites/osgrid.org/web/ogs/assetserver/assets";
?> ?>

1
ogs/assetserver/index.php
View File

@ -5,6 +5,7 @@ include("assetserver_config.inc.php");
// Parse out the parameters from the URL // Parse out the parameters from the URL
$params = str_replace($asset_home,'', $_SERVER['REQUEST_URI']); $params = str_replace($asset_home,'', $_SERVER['REQUEST_URI']);
$params = str_replace("index.php/","",$params);
$params = split('/',$params); $params = split('/',$params);
// Die if the key doesn't match // Die if the key doesn't match

10
src/world/Avatar.cs
View File

@ -125,12 +125,12 @@ namespace OpenSim.world
handshake.RegionInfo.TerrainHeightRange01 = 60; handshake.RegionInfo.TerrainHeightRange01 = 60;
handshake.RegionInfo.TerrainHeightRange10 = 60; handshake.RegionInfo.TerrainHeightRange10 = 60;
handshake.RegionInfo.TerrainHeightRange11 = 60; handshake.RegionInfo.TerrainHeightRange11 = 60;
handshake.RegionInfo.TerrainStartHeight00 = 20; handshake.RegionInfo.TerrainStartHeight00 = 10;
handshake.RegionInfo.TerrainStartHeight01 = 20; handshake.RegionInfo.TerrainStartHeight01 = 10;
handshake.RegionInfo.TerrainStartHeight10 = 20; handshake.RegionInfo.TerrainStartHeight10 = 10;
handshake.RegionInfo.TerrainStartHeight11 = 20; handshake.RegionInfo.TerrainStartHeight11 = 10;
handshake.RegionInfo.SimAccess = 13; handshake.RegionInfo.SimAccess = 13;
handshake.RegionInfo.WaterHeight = 10; handshake.RegionInfo.WaterHeight = 5;
handshake.RegionInfo.RegionFlags = 72458694; handshake.RegionInfo.RegionFlags = 72458694;
handshake.RegionInfo.SimName = _enc.GetBytes(OpenSim_Main.cfg.RegionName + "\0"); handshake.RegionInfo.SimName = _enc.GetBytes(OpenSim_Main.cfg.RegionName + "\0");
handshake.RegionInfo.SimOwner = new LLUUID("00000000-0000-0000-0000-000000000000"); handshake.RegionInfo.SimOwner = new LLUUID("00000000-0000-0000-0000-000000000000");

2
src/world/World.cs
View File

@ -24,7 +24,7 @@ namespace OpenSim.world
terrainengine = new TerrainDecode(); terrainengine = new TerrainDecode();
LandMap = new float[65536]; LandMap = new float[65536];
for(int i =0; i < 65536; i++) { for(int i =0; i < 65536; i++) {
LandMap[i] = 30.4989f; LandMap[i] = 40f;
} }