diff options
author | Sean Dague | 2008-02-11 12:38:51 +0000 |
---|---|---|
committer | Sean Dague | 2008-02-11 12:38:51 +0000 |
commit | c654df5dfdc77dd24d52f94a154d1e5aba739aaf (patch) | |
tree | 6c06b1d230cd55021baedc86fc1c62adda8b726a /OpenSim/Framework/Data.MySQL/MySQLDataStore.cs | |
parent | Unhandled exception handler hookup is now the first thing to happen when Open... (diff) | |
download | opensim-SC-c654df5dfdc77dd24d52f94a154d1e5aba739aaf.zip opensim-SC-c654df5dfdc77dd24d52f94a154d1e5aba739aaf.tar.gz opensim-SC-c654df5dfdc77dd24d52f94a154d1e5aba739aaf.tar.bz2 opensim-SC-c654df5dfdc77dd24d52f94a154d1e5aba739aaf.tar.xz |
From: dirk husemann <hud@zurich.ibm.com>
these two patches fixe the terrain load exception that occurs when
restarting OpenSim on PPC32 by making terrain loading endian clean.
it does NOT fix the client crash exception. need to hunt that one down.
Diffstat (limited to 'OpenSim/Framework/Data.MySQL/MySQLDataStore.cs')
-rw-r--r-- | OpenSim/Framework/Data.MySQL/MySQLDataStore.cs | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/OpenSim/Framework/Data.MySQL/MySQLDataStore.cs b/OpenSim/Framework/Data.MySQL/MySQLDataStore.cs index fcc7cc1..9518724 100644 --- a/OpenSim/Framework/Data.MySQL/MySQLDataStore.cs +++ b/OpenSim/Framework/Data.MySQL/MySQLDataStore.cs | |||
@@ -374,12 +374,13 @@ namespace OpenSim.Framework.Data.MySQL | |||
374 | int rev = 0; | 374 | int rev = 0; |
375 | if (row.Read()) | 375 | if (row.Read()) |
376 | { | 376 | { |
377 | byte[] heightmap = (byte[]) row["Heightfield"]; | 377 | MemoryStream str = new MemoryStream((byte[]) row["Heightfield"]); |
378 | BinaryReader br = new BinaryReader(str); | ||
378 | for (int x = 0; x < 256; x++) | 379 | for (int x = 0; x < 256; x++) |
379 | { | 380 | { |
380 | for (int y = 0; y < 256; y++) | 381 | for (int y = 0; y < 256; y++) |
381 | { | 382 | { |
382 | terret[x, y] = BitConverter.ToDouble(heightmap, ((x*256) + y)*8); | 383 | terret[x, y] = br.ReadDouble(); |
383 | } | 384 | } |
384 | } | 385 | } |
385 | rev = (int) row["Revision"]; | 386 | rev = (int) row["Revision"]; |