diff options
author | Adam Frisby | 2007-08-04 00:56:56 +0000 |
---|---|---|
committer | Adam Frisby | 2007-08-04 00:56:56 +0000 |
commit | 3fc2d86dfe9fa041097eb33a4d7d3660c72df373 (patch) | |
tree | 19681ca3b3a1e339c4b636973f4533f981f47b37 /OpenSim/Region/Environment/EstateManager.cs | |
parent | * Little more cleaning of EstateManager - still needs packets to be moved, bu... (diff) | |
download | opensim-SC_OLD-3fc2d86dfe9fa041097eb33a4d7d3660c72df373.zip opensim-SC_OLD-3fc2d86dfe9fa041097eb33a4d7d3660c72df373.tar.gz opensim-SC_OLD-3fc2d86dfe9fa041097eb33a4d7d3660c72df373.tar.bz2 opensim-SC_OLD-3fc2d86dfe9fa041097eb33a4d7d3660c72df373.tar.xz |
* More work on PermissionManager
Diffstat (limited to 'OpenSim/Region/Environment/EstateManager.cs')
-rw-r--r-- | OpenSim/Region/Environment/EstateManager.cs | 9 |
1 files changed, 4 insertions, 5 deletions
diff --git a/OpenSim/Region/Environment/EstateManager.cs b/OpenSim/Region/Environment/EstateManager.cs index 67cfba6..83bfbb4 100644 --- a/OpenSim/Region/Environment/EstateManager.cs +++ b/OpenSim/Region/Environment/EstateManager.cs | |||
@@ -70,9 +70,8 @@ namespace OpenSim.Region.Environment | |||
70 | /// <param name="corner">Which corner</param> | 70 | /// <param name="corner">Which corner</param> |
71 | /// <param name="lowValue">Minimum height that texture range should cover</param> | 71 | /// <param name="lowValue">Minimum height that texture range should cover</param> |
72 | /// <param name="highValue">Maximum height that texture range should cover</param> | 72 | /// <param name="highValue">Maximum height that texture range should cover</param> |
73 | public void setEstateTextureRange(UInt16 corner, float lowValue, float highValue) | 73 | public void setEstateTextureRange(Int16 corner, float lowValue, float highValue) |
74 | { | 74 | { |
75 | |||
76 | switch (corner) | 75 | switch (corner) |
77 | { | 76 | { |
78 | case 0: | 77 | case 0: |
@@ -99,7 +98,7 @@ namespace OpenSim.Region.Environment | |||
99 | /// </summary> | 98 | /// </summary> |
100 | /// <param name="band">Which texture band</param> | 99 | /// <param name="band">Which texture band</param> |
101 | /// <param name="textureUUID">The UUID of the texture</param> | 100 | /// <param name="textureUUID">The UUID of the texture</param> |
102 | public void setTerrainTexture(UInt16 band, LLUUID textureUUID) | 101 | public void setTerrainTexture(Int16 band, LLUUID textureUUID) |
103 | { | 102 | { |
104 | switch (band) | 103 | switch (band) |
105 | { | 104 | { |
@@ -265,7 +264,7 @@ namespace OpenSim.Region.Environment | |||
265 | if (splitField.Length == 3) | 264 | if (splitField.Length == 3) |
266 | { | 265 | { |
267 | 266 | ||
268 | UInt16 corner = Convert.ToInt16(splitField[0]); | 267 | Int16 corner = Convert.ToInt16(splitField[0]); |
269 | float lowValue = (float)Convert.ToDecimal(splitField[1]); | 268 | float lowValue = (float)Convert.ToDecimal(splitField[1]); |
270 | float highValue = (float)Convert.ToDecimal(splitField[2]); | 269 | float highValue = (float)Convert.ToDecimal(splitField[2]); |
271 | 270 | ||
@@ -283,7 +282,7 @@ namespace OpenSim.Region.Environment | |||
283 | string[] splitField = s.Split(' '); | 282 | string[] splitField = s.Split(' '); |
284 | if (splitField.Length == 2) | 283 | if (splitField.Length == 2) |
285 | { | 284 | { |
286 | UInt16 corner = Convert.ToInt16(splitField[0]); | 285 | Int16 corner = Convert.ToInt16(splitField[0]); |
287 | LLUUID textureUUID = new LLUUID(splitField[1]); | 286 | LLUUID textureUUID = new LLUUID(splitField[1]); |
288 | 287 | ||
289 | setTerrainTexture(corner, textureUUID); | 288 | setTerrainTexture(corner, textureUUID); |