diff options
| author | UbitUmarov | 2015-08-25 12:58:24 +0100 |
|---|---|---|
| committer | UbitUmarov | 2015-08-25 12:58:24 +0100 |
| commit | 50d73873db5a466a640e7d21efb8f32a3dd20df0 (patch) | |
| tree | a1901c6c5f4c1e6e442d350eb1306c2004d4b074 | |
| parent | change internal representation of terrain from int to ushort. This will (diff) | |
| download | opensim-SC-50d73873db5a466a640e7d21efb8f32a3dd20df0.zip opensim-SC-50d73873db5a466a640e7d21efb8f32a3dd20df0.tar.gz opensim-SC-50d73873db5a466a640e7d21efb8f32a3dd20df0.tar.bz2 opensim-SC-50d73873db5a466a640e7d21efb8f32a3dd20df0.tar.xz | |
let mysql be happy with a NULL heighmap ( yeap i made several )
| -rw-r--r-- | OpenSim/Data/MySQL/MySQLSimulationData.cs | 7 |
1 files changed, 5 insertions, 2 deletions
diff --git a/OpenSim/Data/MySQL/MySQLSimulationData.cs b/OpenSim/Data/MySQL/MySQLSimulationData.cs index f3c0160..851fbc2 100644 --- a/OpenSim/Data/MySQL/MySQLSimulationData.cs +++ b/OpenSim/Data/MySQL/MySQLSimulationData.cs | |||
| @@ -670,8 +670,11 @@ namespace OpenSim.Data.MySQL | |||
| 670 | while (reader.Read()) | 670 | while (reader.Read()) |
| 671 | { | 671 | { |
| 672 | int rev = Convert.ToInt32(reader["Revision"]); | 672 | int rev = Convert.ToInt32(reader["Revision"]); |
| 673 | byte[] blob = (byte[])reader["Heightfield"]; | 673 | if ((reader["Heightfield"] != DBNull.Value)) |
| 674 | terrData = TerrainData.CreateFromDatabaseBlobFactory(pSizeX, pSizeY, pSizeZ, rev, blob); | 674 | { |
| 675 | byte[] blob = (byte[])reader["Heightfield"]; | ||
| 676 | terrData = TerrainData.CreateFromDatabaseBlobFactory(pSizeX, pSizeY, pSizeZ, rev, blob); | ||
| 677 | } | ||
| 675 | } | 678 | } |
| 676 | } | 679 | } |
| 677 | } | 680 | } |