diff options
Diffstat (limited to 'OpenSim/Region/Environment/Modules/Terrain/FileLoaders/LLRAW.cs')
-rw-r--r-- | OpenSim/Region/Environment/Modules/Terrain/FileLoaders/LLRAW.cs | 22 |
1 files changed, 11 insertions, 11 deletions
diff --git a/OpenSim/Region/Environment/Modules/Terrain/FileLoaders/LLRAW.cs b/OpenSim/Region/Environment/Modules/Terrain/FileLoaders/LLRAW.cs index 7436dc5..fda46f0 100644 --- a/OpenSim/Region/Environment/Modules/Terrain/FileLoaders/LLRAW.cs +++ b/OpenSim/Region/Environment/Modules/Terrain/FileLoaders/LLRAW.cs | |||
@@ -47,7 +47,7 @@ namespace OpenSim.Region.Environment.Modules.Terrain.FileLoaders | |||
47 | { | 47 | { |
48 | for (x = 0; x < retval.Width; x++) | 48 | for (x = 0; x < retval.Width; x++) |
49 | { | 49 | { |
50 | retval[x, y] = (double)bs.ReadByte() * ((double)bs.ReadByte() / 127.0); | 50 | retval[x, y] = (double) bs.ReadByte() * ((double) bs.ReadByte() / 127.0); |
51 | bs.ReadBytes(11); // Advance the stream to next bytes. | 51 | bs.ReadBytes(11); // Advance the stream to next bytes. |
52 | } | 52 | } |
53 | } | 53 | } |
@@ -58,11 +58,6 @@ namespace OpenSim.Region.Environment.Modules.Terrain.FileLoaders | |||
58 | return retval; | 58 | return retval; |
59 | } | 59 | } |
60 | 60 | ||
61 | public override string ToString() | ||
62 | { | ||
63 | return "LL/SL RAW"; | ||
64 | } | ||
65 | |||
66 | public ITerrainChannel LoadFile(string filename, int x, int y, int fileWidth, int fileHeight, int w, int h) | 61 | public ITerrainChannel LoadFile(string filename, int x, int y, int fileWidth, int fileHeight, int w, int h) |
67 | { | 62 | { |
68 | throw new NotImplementedException(); | 63 | throw new NotImplementedException(); |
@@ -81,7 +76,7 @@ namespace OpenSim.Region.Environment.Modules.Terrain.FileLoaders | |||
81 | { | 76 | { |
82 | for (j = 0; j < 256; j++) | 77 | for (j = 0; j < 256; j++) |
83 | { | 78 | { |
84 | lookupHeightTable[i + (j * 256)] = ((double)i * ((double)j / 127.0)); | 79 | lookupHeightTable[i + (j * 256)] = ((double) i * ((double) j / 127.0)); |
85 | } | 80 | } |
86 | } | 81 | } |
87 | 82 | ||
@@ -103,9 +98,9 @@ namespace OpenSim.Region.Environment.Modules.Terrain.FileLoaders | |||
103 | } | 98 | } |
104 | } | 99 | } |
105 | 100 | ||
106 | byte red = (byte)(index & 0xFF); | 101 | byte red = (byte) (index & 0xFF); |
107 | byte green = (byte)((index >> 8) & 0xFF); | 102 | byte green = (byte) ((index >> 8) & 0xFF); |
108 | byte blue = 20; | 103 | byte blue = 20; |
109 | byte alpha1 = 0; // Land Parcels | 104 | byte alpha1 = 0; // Land Parcels |
110 | byte alpha2 = 0; // For Sale Land | 105 | byte alpha2 = 0; // For Sale Land |
111 | byte alpha3 = 0; // Public Edit Object | 106 | byte alpha3 = 0; // Public Edit Object |
@@ -138,5 +133,10 @@ namespace OpenSim.Region.Environment.Modules.Terrain.FileLoaders | |||
138 | } | 133 | } |
139 | 134 | ||
140 | #endregion | 135 | #endregion |
136 | |||
137 | public override string ToString() | ||
138 | { | ||
139 | return "LL/SL RAW"; | ||
140 | } | ||
141 | } | 141 | } |
142 | } | 142 | } \ No newline at end of file |