diff options
author | Justin Clark-Casey (justincc) | 2012-04-13 22:34:36 +0100 |
---|---|---|
committer | Justin Clark-Casey (justincc) | 2012-04-13 22:34:36 +0100 |
commit | 1ad3fdb40ba86c6d0bcb9b06b5bb05004f670657 (patch) | |
tree | ccbd97c7ed18a0e6b9c5e6c771c6d7a2fca097e9 /OpenSim/Region/CoreModules/World/Estate/EstateManagementModule.cs | |
parent | Remove hardcoded god requirement from osSetRegionWaterHeight, osSetRegionSunS... (diff) | |
parent | Mantis 55025 Implement script time. (diff) | |
download | opensim-SC_OLD-1ad3fdb40ba86c6d0bcb9b06b5bb05004f670657.zip opensim-SC_OLD-1ad3fdb40ba86c6d0bcb9b06b5bb05004f670657.tar.gz opensim-SC_OLD-1ad3fdb40ba86c6d0bcb9b06b5bb05004f670657.tar.bz2 opensim-SC_OLD-1ad3fdb40ba86c6d0bcb9b06b5bb05004f670657.tar.xz |
Merge branch 'master' of ssh://opensimulator.org/var/git/opensim
Diffstat (limited to 'OpenSim/Region/CoreModules/World/Estate/EstateManagementModule.cs')
-rw-r--r-- | OpenSim/Region/CoreModules/World/Estate/EstateManagementModule.cs | 15 |
1 files changed, 13 insertions, 2 deletions
diff --git a/OpenSim/Region/CoreModules/World/Estate/EstateManagementModule.cs b/OpenSim/Region/CoreModules/World/Estate/EstateManagementModule.cs index fc217b0..124f01c 100644 --- a/OpenSim/Region/CoreModules/World/Estate/EstateManagementModule.cs +++ b/OpenSim/Region/CoreModules/World/Estate/EstateManagementModule.cs | |||
@@ -157,12 +157,18 @@ namespace OpenSim.Region.CoreModules.World.Estate | |||
157 | sendRegionInfoPacketToAll(); | 157 | sendRegionInfoPacketToAll(); |
158 | } | 158 | } |
159 | 159 | ||
160 | public void setEstateTerrainBaseTexture(IClientAPI remoteClient, int corner, UUID texture) | 160 | public void setEstateTerrainBaseTexture(int level, UUID texture) |
161 | { | ||
162 | setEstateTerrainBaseTexture(null, level, texture); | ||
163 | sendRegionHandshakeToAll(); | ||
164 | } | ||
165 | |||
166 | public void setEstateTerrainBaseTexture(IClientAPI remoteClient, int level, UUID texture) | ||
161 | { | 167 | { |
162 | if (texture == UUID.Zero) | 168 | if (texture == UUID.Zero) |
163 | return; | 169 | return; |
164 | 170 | ||
165 | switch (corner) | 171 | switch (level) |
166 | { | 172 | { |
167 | case 0: | 173 | case 0: |
168 | Scene.RegionInfo.RegionSettings.TerrainTexture1 = texture; | 174 | Scene.RegionInfo.RegionSettings.TerrainTexture1 = texture; |
@@ -182,6 +188,11 @@ namespace OpenSim.Region.CoreModules.World.Estate | |||
182 | sendRegionInfoPacketToAll(); | 188 | sendRegionInfoPacketToAll(); |
183 | } | 189 | } |
184 | 190 | ||
191 | public void setEstateTerrainTextureHeights(int corner, float lowValue, float highValue) | ||
192 | { | ||
193 | setEstateTerrainTextureHeights(null, corner, lowValue, highValue); | ||
194 | } | ||
195 | |||
185 | public void setEstateTerrainTextureHeights(IClientAPI client, int corner, float lowValue, float highValue) | 196 | public void setEstateTerrainTextureHeights(IClientAPI client, int corner, float lowValue, float highValue) |
186 | { | 197 | { |
187 | switch (corner) | 198 | switch (corner) |