aboutsummaryrefslogtreecommitdiffstatshomepage
diff options
context:
space:
mode:
authorDahlia Trimble2009-02-06 09:58:23 +0000
committerDahlia Trimble2009-02-06 09:58:23 +0000
commit3465447e17d073e8f59d38edc82b80384e15d5ce (patch)
tree2cb1834f5a2a13e30cdfa4d48434a72ab42037a4
parentmove RegionDenyAgeUnverified parameter to AgeVerificationBlock in parcel prop... (diff)
downloadopensim-SC_OLD-3465447e17d073e8f59d38edc82b80384e15d5ce.zip
opensim-SC_OLD-3465447e17d073e8f59d38edc82b80384e15d5ce.tar.gz
opensim-SC_OLD-3465447e17d073e8f59d38edc82b80384e15d5ce.tar.bz2
opensim-SC_OLD-3465447e17d073e8f59d38edc82b80384e15d5ce.tar.xz
more eventqueue endian madness
-rw-r--r--OpenSim/Region/Environment/Modules/Framework/EventQueue/EventQueueHelper.cs14
1 files changed, 5 insertions, 9 deletions
diff --git a/OpenSim/Region/Environment/Modules/Framework/EventQueue/EventQueueHelper.cs b/OpenSim/Region/Environment/Modules/Framework/EventQueue/EventQueueHelper.cs
index 337d73d..546d9d1 100644
--- a/OpenSim/Region/Environment/Modules/Framework/EventQueue/EventQueueHelper.cs
+++ b/OpenSim/Region/Environment/Modules/Framework/EventQueue/EventQueueHelper.cs
@@ -55,15 +55,11 @@ namespace OpenSim.Region.Environment
55 55
56 private static byte[] uintToByteArray(uint uIntValue) 56 private static byte[] uintToByteArray(uint uIntValue)
57 { 57 {
58 // Reverse endianness of a uint 58 byte[] resultbytes = Utils.UIntToBytes(uIntValue);
59 return new byte[] 59 if (BitConverter.IsLittleEndian)
60 { 60 Array.Reverse(resultbytes);
61 (byte)((uIntValue >> 24) % 256),
62 (byte)((uIntValue >> 16) % 256),
63 (byte)((uIntValue >> 8) % 256),
64 (byte)(uIntValue % 256)
65 61
66 }; 62 return resultbytes;
67 } 63 }
68 64
69 public static OSD buildEvent(string eventName, OSD eventBody) 65 public static OSD buildEvent(string eventName, OSD eventBody)
@@ -359,7 +355,7 @@ namespace OpenSim.Region.Environment
359 parcelDataMap.Add("AABBMin", AABBMin); 355 parcelDataMap.Add("AABBMin", AABBMin);
360 356
361 parcelDataMap.Add("Area", OSD.FromInteger(parcelPropertiesPacket.ParcelData.Area)); 357 parcelDataMap.Add("Area", OSD.FromInteger(parcelPropertiesPacket.ParcelData.Area));
362 parcelDataMap.Add("AuctionID", OSD.FromBinary(parcelPropertiesPacket.ParcelData.AuctionID)); 358 parcelDataMap.Add("AuctionID", OSD.FromBinary(uintToByteArray(parcelPropertiesPacket.ParcelData.AuctionID)));
363 parcelDataMap.Add("AuthBuyerID", OSD.FromUUID(parcelPropertiesPacket.ParcelData.AuthBuyerID)); 359 parcelDataMap.Add("AuthBuyerID", OSD.FromUUID(parcelPropertiesPacket.ParcelData.AuthBuyerID));
364 parcelDataMap.Add("Bitmap", OSD.FromBinary(parcelPropertiesPacket.ParcelData.Bitmap)); 360 parcelDataMap.Add("Bitmap", OSD.FromBinary(parcelPropertiesPacket.ParcelData.Bitmap));
365 parcelDataMap.Add("Category", OSD.FromInteger((int)parcelPropertiesPacket.ParcelData.Category)); 361 parcelDataMap.Add("Category", OSD.FromInteger((int)parcelPropertiesPacket.ParcelData.Category));