Merge branch 'master' into careminster-presence-refactor
commit
483fc88b07
|
@ -47,5 +47,6 @@ namespace OpenSim.Framework
|
|||
public bool useEstateSun;
|
||||
public float waterHeight;
|
||||
public string simName;
|
||||
public string regionType;
|
||||
}
|
||||
}
|
||||
}
|
||||
|
|
|
@ -742,7 +742,7 @@ namespace OpenSim.Region.ClientStack.LindenUDP
|
|||
handshake.RegionInfo3.CPURatio = 1;
|
||||
|
||||
handshake.RegionInfo3.ColoName = Utils.EmptyBytes;
|
||||
handshake.RegionInfo3.ProductName = Utils.EmptyBytes;
|
||||
handshake.RegionInfo3.ProductName = Util.StringToBytes256(regionInfo.RegionType);
|
||||
handshake.RegionInfo3.ProductSKU = Utils.EmptyBytes;
|
||||
|
||||
OutPacket(handshake, ThrottleOutPacketType.Task);
|
||||
|
@ -4141,7 +4141,7 @@ namespace OpenSim.Region.ClientStack.LindenUDP
|
|||
rinfopack.RegionInfo2.HardMaxAgents = uint.MaxValue;
|
||||
rinfopack.RegionInfo2.HardMaxObjects = uint.MaxValue;
|
||||
rinfopack.RegionInfo2.MaxAgents32 = uint.MaxValue;
|
||||
rinfopack.RegionInfo2.ProductName = Utils.EmptyBytes;
|
||||
rinfopack.RegionInfo2.ProductName = Util.StringToBytes256(args.regionType);
|
||||
rinfopack.RegionInfo2.ProductSKU = Utils.EmptyBytes;
|
||||
|
||||
rinfopack.HasVariableBlocks = true;
|
||||
|
|
|
@ -672,6 +672,7 @@ namespace OpenSim.Region.CoreModules.World.Estate
|
|||
args.useEstateSun = m_scene.RegionInfo.RegionSettings.UseEstateSun;
|
||||
args.waterHeight = (float)m_scene.RegionInfo.RegionSettings.WaterHeight;
|
||||
args.simName = m_scene.RegionInfo.RegionName;
|
||||
args.regionType = m_scene.RegionInfo.RegionType;
|
||||
|
||||
remote_client.SendRegionInfoToEstateMenu(args);
|
||||
}
|
||||
|
|
Loading…
Reference in New Issue