aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Region/Environment/Modules/World/Land/LandObject.cs
diff options
context:
space:
mode:
Diffstat (limited to 'OpenSim/Region/Environment/Modules/World/Land/LandObject.cs')
-rw-r--r--OpenSim/Region/Environment/Modules/World/Land/LandObject.cs30
1 files changed, 15 insertions, 15 deletions
diff --git a/OpenSim/Region/Environment/Modules/World/Land/LandObject.cs b/OpenSim/Region/Environment/Modules/World/Land/LandObject.cs
index 54fe9ae..e297b10 100644
--- a/OpenSim/Region/Environment/Modules/World/Land/LandObject.cs
+++ b/OpenSim/Region/Environment/Modules/World/Land/LandObject.cs
@@ -73,8 +73,6 @@ namespace OpenSim.Region.Environment.Modules.World.Land
73 get { return m_scene.RegionInfo.RegionID; } 73 get { return m_scene.RegionInfo.RegionID; }
74 } 74 }
75 75
76 #endregion
77
78 #region Constructors 76 #region Constructors
79 77
80 public LandObject(LLUUID owner_id, bool is_group_owned, Scene scene) 78 public LandObject(LLUUID owner_id, bool is_group_owned, Scene scene)
@@ -100,7 +98,7 @@ namespace OpenSim.Region.Environment.Modules.World.Land
100 { 98 {
101 if (x >= 0 && y >= 0 && x <= Constants.RegionSize && x <= Constants.RegionSize) 99 if (x >= 0 && y >= 0 && x <= Constants.RegionSize && x <= Constants.RegionSize)
102 { 100 {
103 return landBitmap[x / 4, y / 4]; 101 return (landBitmap[x / 4, y / 4] == true);
104 } 102 }
105 else 103 else
106 { 104 {
@@ -150,7 +148,7 @@ namespace OpenSim.Region.Environment.Modules.World.Land
150 updatePacket.ParcelData.GroupID = landData.groupID; 148 updatePacket.ParcelData.GroupID = landData.groupID;
151 updatePacket.ParcelData.GroupPrims = landData.groupPrims; 149 updatePacket.ParcelData.GroupPrims = landData.groupPrims;
152 updatePacket.ParcelData.IsGroupOwned = landData.isGroupOwned; 150 updatePacket.ParcelData.IsGroupOwned = landData.isGroupOwned;
153 updatePacket.ParcelData.LandingType = landData.landingType; 151 updatePacket.ParcelData.LandingType = (byte) landData.landingType;
154 updatePacket.ParcelData.LocalID = landData.localID; 152 updatePacket.ParcelData.LocalID = landData.localID;
155 if (landData.area > 0) 153 if (landData.area > 0)
156 { 154 {
@@ -214,7 +212,7 @@ namespace OpenSim.Region.Environment.Modules.World.Land
214 landData.selectedPrims; 212 landData.selectedPrims;
215 updatePacket.ParcelData.UserLocation = landData.userLocation; 213 updatePacket.ParcelData.UserLocation = landData.userLocation;
216 updatePacket.ParcelData.UserLookAt = landData.userLookAt; 214 updatePacket.ParcelData.UserLookAt = landData.userLookAt;
217 remote_client.OutPacket(updatePacket, ThrottleOutPacketType.Task); 215 remote_client.OutPacket((Packet) updatePacket, ThrottleOutPacketType.Task);
218 } 216 }
219 217
220 public void updateLandProperties(ParcelPropertiesUpdatePacket packet, IClientAPI remote_client) 218 public void updateLandProperties(ParcelPropertiesUpdatePacket packet, IClientAPI remote_client)
@@ -357,7 +355,7 @@ namespace OpenSim.Region.Environment.Modules.World.Land
357 { 355 {
358 ParcelAccessListReplyPacket.ListBlock listBlock = new ParcelAccessListReplyPacket.ListBlock(); 356 ParcelAccessListReplyPacket.ListBlock listBlock = new ParcelAccessListReplyPacket.ListBlock();
359 357
360 listBlock.Flags = 0; 358 listBlock.Flags = (uint) 0;
361 listBlock.ID = entry.AgentID; 359 listBlock.ID = entry.AgentID;
362 listBlock.Time = 0; 360 listBlock.Time = 0;
363 361
@@ -369,7 +367,7 @@ namespace OpenSim.Region.Environment.Modules.World.Land
369 { 367 {
370 ParcelAccessListReplyPacket.ListBlock listBlock = new ParcelAccessListReplyPacket.ListBlock(); 368 ParcelAccessListReplyPacket.ListBlock listBlock = new ParcelAccessListReplyPacket.ListBlock();
371 369
372 listBlock.Flags = 0; 370 listBlock.Flags = (uint) 0;
373 listBlock.ID = LLUUID.Zero; 371 listBlock.ID = LLUUID.Zero;
374 listBlock.Time = 0; 372 listBlock.Time = 0;
375 373
@@ -392,7 +390,7 @@ namespace OpenSim.Region.Environment.Modules.World.Land
392 replyPacket.Data.SequenceID = 0; 390 replyPacket.Data.SequenceID = 0;
393 391
394 replyPacket.List = createAccessListArrayByFlag(ParcelManager.AccessList.Access); 392 replyPacket.List = createAccessListArrayByFlag(ParcelManager.AccessList.Access);
395 remote_client.OutPacket(replyPacket, ThrottleOutPacketType.Task); 393 remote_client.OutPacket((Packet) replyPacket, ThrottleOutPacketType.Task);
396 } 394 }
397 395
398 if (flags == (uint) ParcelManager.AccessList.Ban || flags == (uint) ParcelManager.AccessList.Both) 396 if (flags == (uint) ParcelManager.AccessList.Ban || flags == (uint) ParcelManager.AccessList.Both)
@@ -404,7 +402,7 @@ namespace OpenSim.Region.Environment.Modules.World.Land
404 replyPacket.Data.SequenceID = 0; 402 replyPacket.Data.SequenceID = 0;
405 403
406 replyPacket.List = createAccessListArrayByFlag(ParcelManager.AccessList.Ban); 404 replyPacket.List = createAccessListArrayByFlag(ParcelManager.AccessList.Ban);
407 remote_client.OutPacket(replyPacket, ThrottleOutPacketType.Task); 405 remote_client.OutPacket((Packet) replyPacket, ThrottleOutPacketType.Task);
408 } 406 }
409 } 407 }
410 408
@@ -484,7 +482,7 @@ namespace OpenSim.Region.Environment.Modules.World.Land
484 { 482 {
485 for (y = 0; y < 64; y++) 483 for (y = 0; y < 64; y++)
486 { 484 {
487 if (landBitmap[x, y]) 485 if (landBitmap[x, y] == true)
488 { 486 {
489 if (min_x > x) min_x = x; 487 if (min_x > x) min_x = x;
490 if (min_y > y) min_y = y; 488 if (min_y > y) min_y = y;
@@ -501,7 +499,7 @@ namespace OpenSim.Region.Environment.Modules.World.Land
501 if (ty > 255) 499 if (ty > 255)
502 ty = 255; 500 ty = 255;
503 landData.AABBMin = 501 landData.AABBMin =
504 new LLVector3((min_x * 4), (min_y * 4), 502 new LLVector3((float) (min_x * 4), (float) (min_y * 4),
505 (float) m_scene.Heightmap[tx, ty]); 503 (float) m_scene.Heightmap[tx, ty]);
506 504
507 tx = max_x * 4; 505 tx = max_x * 4;
@@ -511,7 +509,7 @@ namespace OpenSim.Region.Environment.Modules.World.Land
511 if (ty > 255) 509 if (ty > 255)
512 ty = 255; 510 ty = 255;
513 landData.AABBMax = 511 landData.AABBMax =
514 new LLVector3((max_x * 4), (max_y * 4), 512 new LLVector3((float) (max_x * 4), (float) (max_y * 4),
515 (float) m_scene.Heightmap[tx, ty]); 513 (float) m_scene.Heightmap[tx, ty]);
516 landData.area = tempArea; 514 landData.area = tempArea;
517 } 515 }
@@ -659,7 +657,7 @@ namespace OpenSim.Region.Environment.Modules.World.Land
659 if (i % 8 == 0) 657 if (i % 8 == 0)
660 { 658 {
661 tempConvertArr[byteNum] = tempByte; 659 tempConvertArr[byteNum] = tempByte;
662 tempByte = 0; 660 tempByte = (byte) 0;
663 i = 0; 661 i = 0;
664 byteNum++; 662 byteNum++;
665 } 663 }
@@ -679,7 +677,7 @@ namespace OpenSim.Region.Environment.Modules.World.Land
679 tempByte = landData.landBitmapByteArray[i]; 677 tempByte = landData.landBitmapByteArray[i];
680 for (bitNum = 0; bitNum < 8; bitNum++) 678 for (bitNum = 0; bitNum < 8; bitNum++)
681 { 679 {
682 bool bit = Convert.ToBoolean(Convert.ToByte(tempByte >> bitNum) & 1); 680 bool bit = Convert.ToBoolean(Convert.ToByte(tempByte >> bitNum) & (byte) 1);
683 tempConvertMap[x, y] = bit; 681 tempConvertMap[x, y] = bit;
684 x++; 682 x++;
685 if (x > 63) 683 if (x > 63)
@@ -753,7 +751,7 @@ namespace OpenSim.Region.Environment.Modules.World.Land
753 resultLocalIDs.RemoveAt(0); 751 resultLocalIDs.RemoveAt(0);
754 } 752 }
755 pack.Data = data; 753 pack.Data = data;
756 remote_client.OutPacket(pack, ThrottleOutPacketType.Task); 754 remote_client.OutPacket((Packet) pack, ThrottleOutPacketType.Task);
757 } 755 }
758 } 756 }
759 757
@@ -924,5 +922,7 @@ namespace OpenSim.Region.Environment.Modules.World.Land
924 #endregion 922 #endregion
925 923
926 #endregion 924 #endregion
925
926 #endregion
927 } 927 }
928} \ No newline at end of file 928} \ No newline at end of file