diff options
author | UbitUmarov | 2015-08-27 04:45:16 +0100 |
---|---|---|
committer | UbitUmarov | 2015-08-27 04:45:16 +0100 |
commit | c7ddb790a7b97115874f74a055e1d0c192eb8ef2 (patch) | |
tree | d6e280a4b89704334a49c12956d8592187f5db72 /OpenSim/Region/ClientStack/Linden/Caps/EventQueue | |
parent | NEVER EVER SEND TERRAIN PATCHS AS UNRELIABLE!!!!!!!!!!!!!!!!!!!!!!!!!! (diff) | |
download | opensim-SC-c7ddb790a7b97115874f74a055e1d0c192eb8ef2.zip opensim-SC-c7ddb790a7b97115874f74a055e1d0c192eb8ef2.tar.gz opensim-SC-c7ddb790a7b97115874f74a055e1d0c192eb8ef2.tar.bz2 opensim-SC-c7ddb790a7b97115874f74a055e1d0c192eb8ef2.tar.xz |
change osd encoding of region size
Diffstat (limited to 'OpenSim/Region/ClientStack/Linden/Caps/EventQueue')
-rw-r--r-- | OpenSim/Region/ClientStack/Linden/Caps/EventQueue/EventQueueHelper.cs | 16 |
1 files changed, 8 insertions, 8 deletions
diff --git a/OpenSim/Region/ClientStack/Linden/Caps/EventQueue/EventQueueHelper.cs b/OpenSim/Region/ClientStack/Linden/Caps/EventQueue/EventQueueHelper.cs index 3fb7de2..50e22f5 100644 --- a/OpenSim/Region/ClientStack/Linden/Caps/EventQueue/EventQueueHelper.cs +++ b/OpenSim/Region/ClientStack/Linden/Caps/EventQueue/EventQueueHelper.cs | |||
@@ -77,8 +77,8 @@ namespace OpenSim.Region.ClientStack.Linden | |||
77 | llsdSimInfo.Add("Handle", new OSDBinary(ulongToByteArray(handle))); | 77 | llsdSimInfo.Add("Handle", new OSDBinary(ulongToByteArray(handle))); |
78 | llsdSimInfo.Add("IP", new OSDBinary(endPoint.Address.GetAddressBytes())); | 78 | llsdSimInfo.Add("IP", new OSDBinary(endPoint.Address.GetAddressBytes())); |
79 | llsdSimInfo.Add("Port", new OSDInteger(endPoint.Port)); | 79 | llsdSimInfo.Add("Port", new OSDInteger(endPoint.Port)); |
80 | llsdSimInfo.Add("RegionSizeX", new OSDInteger(regionSizeX)); | 80 | llsdSimInfo.Add("RegionSizeX", OSD.FromUInteger((uint)regionSizeX)); |
81 | llsdSimInfo.Add("RegionSizeY", new OSDInteger(regionSizeY)); | 81 | llsdSimInfo.Add("RegionSizeY", OSD.FromUInteger((uint)regionSizeY)); |
82 | 82 | ||
83 | OSDArray arr = new OSDArray(1); | 83 | OSDArray arr = new OSDArray(1); |
84 | arr.Add(llsdSimInfo); | 84 | arr.Add(llsdSimInfo); |
@@ -138,8 +138,8 @@ namespace OpenSim.Region.ClientStack.Linden | |||
138 | regionDataMap.Add("SeedCapability", OSD.FromString(capsURL)); | 138 | regionDataMap.Add("SeedCapability", OSD.FromString(capsURL)); |
139 | regionDataMap.Add("SimIP", OSD.FromBinary(newRegionExternalEndPoint.Address.GetAddressBytes())); | 139 | regionDataMap.Add("SimIP", OSD.FromBinary(newRegionExternalEndPoint.Address.GetAddressBytes())); |
140 | regionDataMap.Add("SimPort", OSD.FromInteger(newRegionExternalEndPoint.Port)); | 140 | regionDataMap.Add("SimPort", OSD.FromInteger(newRegionExternalEndPoint.Port)); |
141 | regionDataMap.Add("RegionSizeX", new OSDInteger(regionSizeX)); | 141 | regionDataMap.Add("RegionSizeX", OSD.FromUInteger((uint)regionSizeX)); |
142 | regionDataMap.Add("RegionSizeY", new OSDInteger(regionSizeY)); | 142 | regionDataMap.Add("RegionSizeY", OSD.FromUInteger((uint)regionSizeY)); |
143 | 143 | ||
144 | OSDArray regionDataArr = new OSDArray(1); | 144 | OSDArray regionDataArr = new OSDArray(1); |
145 | regionDataArr.Add(regionDataMap); | 145 | regionDataArr.Add(regionDataMap); |
@@ -173,8 +173,8 @@ namespace OpenSim.Region.ClientStack.Linden | |||
173 | info.Add("SimPort", OSD.FromInteger(regionExternalEndPoint.Port)); | 173 | info.Add("SimPort", OSD.FromInteger(regionExternalEndPoint.Port)); |
174 | // info.Add("TeleportFlags", OSD.FromULong(1L << 4)); // AgentManager.TeleportFlags.ViaLocation | 174 | // info.Add("TeleportFlags", OSD.FromULong(1L << 4)); // AgentManager.TeleportFlags.ViaLocation |
175 | info.Add("TeleportFlags", OSD.FromUInteger(flags)); | 175 | info.Add("TeleportFlags", OSD.FromUInteger(flags)); |
176 | info.Add("RegionSizeX", new OSDInteger(regionSizeX)); | 176 | info.Add("RegionSizeX", OSD.FromUInteger((uint)regionSizeX)); |
177 | info.Add("RegionSizeY", new OSDInteger(regionSizeY)); | 177 | info.Add("RegionSizeY", OSD.FromUInteger((uint)regionSizeY)); |
178 | 178 | ||
179 | OSDArray infoArr = new OSDArray(); | 179 | OSDArray infoArr = new OSDArray(); |
180 | infoArr.Add(info); | 180 | infoArr.Add(info); |
@@ -211,8 +211,8 @@ namespace OpenSim.Region.ClientStack.Linden | |||
211 | {"sim-ip-and-port", new OSDString(simIpAndPort)}, | 211 | {"sim-ip-and-port", new OSDString(simIpAndPort)}, |
212 | {"seed-capability", new OSDString(seedcap)}, | 212 | {"seed-capability", new OSDString(seedcap)}, |
213 | {"region-handle", OSD.FromULong(regionHandle)}, | 213 | {"region-handle", OSD.FromULong(regionHandle)}, |
214 | {"region-size-x", OSD.FromInteger(regionSizeX)}, | 214 | {"region-size-x", OSD.FromUInteger((uint)regionSizeX)}, |
215 | {"region-size-y", OSD.FromInteger(regionSizeY)} | 215 | {"region-size-y", OSD.FromUInteger((uint)regionSizeY)} |
216 | }; | 216 | }; |
217 | 217 | ||
218 | return BuildEvent("EstablishAgentCommunication", body); | 218 | return BuildEvent("EstablishAgentCommunication", body); |