diff options
author | lbsa71 | 2007-10-22 17:55:49 +0000 |
---|---|---|
committer | lbsa71 | 2007-10-22 17:55:49 +0000 |
commit | dd770c384c2e63cf8a1e2f522741afb8adfab4c2 (patch) | |
tree | 97bc7dacf15388d8b32639219ea51872961de2cd /OpenSim/Region/ClientStack | |
parent | after a small misunderstanding with the match group numbers (diff) | |
download | opensim-SC_OLD-dd770c384c2e63cf8a1e2f522741afb8adfab4c2.zip opensim-SC_OLD-dd770c384c2e63cf8a1e2f522741afb8adfab4c2.tar.gz opensim-SC_OLD-dd770c384c2e63cf8a1e2f522741afb8adfab4c2.tar.bz2 opensim-SC_OLD-dd770c384c2e63cf8a1e2f522741afb8adfab4c2.tar.xz |
* Made EstateSetting static since there's only one instance, and we only need to create it once
* Now cacheing RegionInfos indefinitively; we should add a tiomeout to this cache
Diffstat (limited to '')
-rw-r--r-- | OpenSim/Region/ClientStack/ClientView.API.cs | 40 |
1 files changed, 20 insertions, 20 deletions
diff --git a/OpenSim/Region/ClientStack/ClientView.API.cs b/OpenSim/Region/ClientStack/ClientView.API.cs index ed3c16c..a1e4b56 100644 --- a/OpenSim/Region/ClientStack/ClientView.API.cs +++ b/OpenSim/Region/ClientStack/ClientView.API.cs | |||
@@ -169,32 +169,32 @@ namespace OpenSim.Region.ClientStack | |||
169 | Encoding _enc = Encoding.ASCII; | 169 | Encoding _enc = Encoding.ASCII; |
170 | RegionHandshakePacket handshake = new RegionHandshakePacket(); | 170 | RegionHandshakePacket handshake = new RegionHandshakePacket(); |
171 | 171 | ||
172 | handshake.RegionInfo.BillableFactor = regionInfo.estateSettings.billableFactor; | 172 | handshake.RegionInfo.BillableFactor = regionInfo.EstateSettings.billableFactor; |
173 | handshake.RegionInfo.IsEstateManager = false; | 173 | handshake.RegionInfo.IsEstateManager = false; |
174 | handshake.RegionInfo.TerrainHeightRange00 = regionInfo.estateSettings.terrainHeightRange0; | 174 | handshake.RegionInfo.TerrainHeightRange00 = regionInfo.EstateSettings.terrainHeightRange0; |
175 | handshake.RegionInfo.TerrainHeightRange01 = regionInfo.estateSettings.terrainHeightRange1; | 175 | handshake.RegionInfo.TerrainHeightRange01 = regionInfo.EstateSettings.terrainHeightRange1; |
176 | handshake.RegionInfo.TerrainHeightRange10 = regionInfo.estateSettings.terrainHeightRange2; | 176 | handshake.RegionInfo.TerrainHeightRange10 = regionInfo.EstateSettings.terrainHeightRange2; |
177 | handshake.RegionInfo.TerrainHeightRange11 = regionInfo.estateSettings.terrainHeightRange3; | 177 | handshake.RegionInfo.TerrainHeightRange11 = regionInfo.EstateSettings.terrainHeightRange3; |
178 | handshake.RegionInfo.TerrainStartHeight00 = regionInfo.estateSettings.terrainStartHeight0; | 178 | handshake.RegionInfo.TerrainStartHeight00 = regionInfo.EstateSettings.terrainStartHeight0; |
179 | handshake.RegionInfo.TerrainStartHeight01 = regionInfo.estateSettings.terrainStartHeight1; | 179 | handshake.RegionInfo.TerrainStartHeight01 = regionInfo.EstateSettings.terrainStartHeight1; |
180 | handshake.RegionInfo.TerrainStartHeight10 = regionInfo.estateSettings.terrainStartHeight2; | 180 | handshake.RegionInfo.TerrainStartHeight10 = regionInfo.EstateSettings.terrainStartHeight2; |
181 | handshake.RegionInfo.TerrainStartHeight11 = regionInfo.estateSettings.terrainStartHeight3; | 181 | handshake.RegionInfo.TerrainStartHeight11 = regionInfo.EstateSettings.terrainStartHeight3; |
182 | handshake.RegionInfo.SimAccess = (byte)regionInfo.estateSettings.simAccess; | 182 | handshake.RegionInfo.SimAccess = (byte)regionInfo.EstateSettings.simAccess; |
183 | handshake.RegionInfo.WaterHeight = regionInfo.estateSettings.waterHeight; | 183 | handshake.RegionInfo.WaterHeight = regionInfo.EstateSettings.waterHeight; |
184 | 184 | ||
185 | 185 | ||
186 | handshake.RegionInfo.RegionFlags = (uint)regionInfo.estateSettings.regionFlags; | 186 | handshake.RegionInfo.RegionFlags = (uint)regionInfo.EstateSettings.regionFlags; |
187 | 187 | ||
188 | handshake.RegionInfo.SimName = _enc.GetBytes(regionInfo.RegionName + "\0"); | 188 | handshake.RegionInfo.SimName = _enc.GetBytes(regionInfo.RegionName + "\0"); |
189 | handshake.RegionInfo.SimOwner = regionInfo.MasterAvatarAssignedUUID; | 189 | handshake.RegionInfo.SimOwner = regionInfo.MasterAvatarAssignedUUID; |
190 | handshake.RegionInfo.TerrainBase0 = regionInfo.estateSettings.terrainBase0; | 190 | handshake.RegionInfo.TerrainBase0 = regionInfo.EstateSettings.terrainBase0; |
191 | handshake.RegionInfo.TerrainBase1 = regionInfo.estateSettings.terrainBase1; | 191 | handshake.RegionInfo.TerrainBase1 = regionInfo.EstateSettings.terrainBase1; |
192 | handshake.RegionInfo.TerrainBase2 = regionInfo.estateSettings.terrainBase2; | 192 | handshake.RegionInfo.TerrainBase2 = regionInfo.EstateSettings.terrainBase2; |
193 | handshake.RegionInfo.TerrainBase3 = regionInfo.estateSettings.terrainBase3; | 193 | handshake.RegionInfo.TerrainBase3 = regionInfo.EstateSettings.terrainBase3; |
194 | handshake.RegionInfo.TerrainDetail0 = regionInfo.estateSettings.terrainDetail0; | 194 | handshake.RegionInfo.TerrainDetail0 = regionInfo.EstateSettings.terrainDetail0; |
195 | handshake.RegionInfo.TerrainDetail1 = regionInfo.estateSettings.terrainDetail1; | 195 | handshake.RegionInfo.TerrainDetail1 = regionInfo.EstateSettings.terrainDetail1; |
196 | handshake.RegionInfo.TerrainDetail2 = regionInfo.estateSettings.terrainDetail2; | 196 | handshake.RegionInfo.TerrainDetail2 = regionInfo.EstateSettings.terrainDetail2; |
197 | handshake.RegionInfo.TerrainDetail3 = regionInfo.estateSettings.terrainDetail3; | 197 | handshake.RegionInfo.TerrainDetail3 = regionInfo.EstateSettings.terrainDetail3; |
198 | handshake.RegionInfo.CacheID = LLUUID.Random(); //I guess this is for the client to remember an old setting? | 198 | handshake.RegionInfo.CacheID = LLUUID.Random(); //I guess this is for the client to remember an old setting? |
199 | 199 | ||
200 | this.OutPacket(handshake); | 200 | this.OutPacket(handshake); |