varregion: properly pack the region size parameters so he viewer will parse them.
This gets rid of the viewer crash when teleporting into varregions and allows multiple, adjacent varregions (of the same size) with border crossings.varregion
parent
1eea6fd452
commit
cc5cffc212
|
@ -77,8 +77,8 @@ namespace OpenSim.Region.ClientStack.Linden
|
|||
llsdSimInfo.Add("Handle", new OSDBinary(ulongToByteArray(handle)));
|
||||
llsdSimInfo.Add("IP", new OSDBinary(endPoint.Address.GetAddressBytes()));
|
||||
llsdSimInfo.Add("Port", new OSDInteger(endPoint.Port));
|
||||
llsdSimInfo.Add("RegionSizeX", new OSDInteger(regionSizeX));
|
||||
llsdSimInfo.Add("RegionSizeY", new OSDInteger(regionSizeY));
|
||||
llsdSimInfo.Add("RegionSizeX", OSD.FromUInteger((uint) regionSizeX));
|
||||
llsdSimInfo.Add("RegionSizeY", OSD.FromUInteger((uint) regionSizeY));
|
||||
|
||||
OSDArray arr = new OSDArray(1);
|
||||
arr.Add(llsdSimInfo);
|
||||
|
@ -138,8 +138,8 @@ namespace OpenSim.Region.ClientStack.Linden
|
|||
regionDataMap.Add("SeedCapability", OSD.FromString(capsURL));
|
||||
regionDataMap.Add("SimIP", OSD.FromBinary(newRegionExternalEndPoint.Address.GetAddressBytes()));
|
||||
regionDataMap.Add("SimPort", OSD.FromInteger(newRegionExternalEndPoint.Port));
|
||||
regionDataMap.Add("RegionSizeX", new OSDInteger(regionSizeX));
|
||||
regionDataMap.Add("RegionSizeY", new OSDInteger(regionSizeY));
|
||||
regionDataMap.Add("RegionSizeX", OSD.FromUInteger((uint)regionSizeX));
|
||||
regionDataMap.Add("RegionSizeY", OSD.FromUInteger((uint)regionSizeY));
|
||||
|
||||
OSDArray regionDataArr = new OSDArray(1);
|
||||
regionDataArr.Add(regionDataMap);
|
||||
|
@ -166,8 +166,8 @@ namespace OpenSim.Region.ClientStack.Linden
|
|||
info.Add("SimIP", OSD.FromBinary(regionExternalEndPoint.Address.GetAddressBytes()));
|
||||
info.Add("SimPort", OSD.FromInteger(regionExternalEndPoint.Port));
|
||||
info.Add("TeleportFlags", OSD.FromULong(1L << 4)); // AgentManager.TeleportFlags.ViaLocation
|
||||
info.Add("RegionSizeX", new OSDInteger(regionSizeX));
|
||||
info.Add("RegionSizeY", new OSDInteger(regionSizeY));
|
||||
info.Add("RegionSizeX", OSD.FromUInteger((uint)regionSizeX));
|
||||
info.Add("RegionSizeY", OSD.FromUInteger((uint)regionSizeY));
|
||||
|
||||
OSDArray infoArr = new OSDArray();
|
||||
infoArr.Add(info);
|
||||
|
|
Loading…
Reference in New Issue