diff options
| author | Melanie | 2010-08-24 17:37:11 +0100 |
|---|---|---|
| committer | Melanie | 2010-08-24 17:37:11 +0100 |
| commit | 483fc88b07b2f7d4f89c021fbb5883e0494b3244 (patch) | |
| tree | 34bf6f8c94b225990a4bee035984f02e0cea7055 /OpenSim/Region/ClientStack | |
| parent | Merge branch 'master' into careminster-presence-refactor (diff) | |
| parent | Plumb the region type through to the ProductName field in estate messages (diff) | |
| download | opensim-SC_OLD-483fc88b07b2f7d4f89c021fbb5883e0494b3244.zip opensim-SC_OLD-483fc88b07b2f7d4f89c021fbb5883e0494b3244.tar.gz opensim-SC_OLD-483fc88b07b2f7d4f89c021fbb5883e0494b3244.tar.bz2 opensim-SC_OLD-483fc88b07b2f7d4f89c021fbb5883e0494b3244.tar.xz | |
Merge branch 'master' into careminster-presence-refactor
Diffstat (limited to 'OpenSim/Region/ClientStack')
| -rw-r--r-- | OpenSim/Region/ClientStack/LindenUDP/LLClientView.cs | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/OpenSim/Region/ClientStack/LindenUDP/LLClientView.cs b/OpenSim/Region/ClientStack/LindenUDP/LLClientView.cs index ce9f145..87ed90f 100644 --- a/OpenSim/Region/ClientStack/LindenUDP/LLClientView.cs +++ b/OpenSim/Region/ClientStack/LindenUDP/LLClientView.cs | |||
| @@ -742,7 +742,7 @@ namespace OpenSim.Region.ClientStack.LindenUDP | |||
| 742 | handshake.RegionInfo3.CPURatio = 1; | 742 | handshake.RegionInfo3.CPURatio = 1; |
| 743 | 743 | ||
| 744 | handshake.RegionInfo3.ColoName = Utils.EmptyBytes; | 744 | handshake.RegionInfo3.ColoName = Utils.EmptyBytes; |
| 745 | handshake.RegionInfo3.ProductName = Utils.EmptyBytes; | 745 | handshake.RegionInfo3.ProductName = Util.StringToBytes256(regionInfo.RegionType); |
| 746 | handshake.RegionInfo3.ProductSKU = Utils.EmptyBytes; | 746 | handshake.RegionInfo3.ProductSKU = Utils.EmptyBytes; |
| 747 | 747 | ||
| 748 | OutPacket(handshake, ThrottleOutPacketType.Task); | 748 | OutPacket(handshake, ThrottleOutPacketType.Task); |
| @@ -4141,7 +4141,7 @@ namespace OpenSim.Region.ClientStack.LindenUDP | |||
| 4141 | rinfopack.RegionInfo2.HardMaxAgents = uint.MaxValue; | 4141 | rinfopack.RegionInfo2.HardMaxAgents = uint.MaxValue; |
| 4142 | rinfopack.RegionInfo2.HardMaxObjects = uint.MaxValue; | 4142 | rinfopack.RegionInfo2.HardMaxObjects = uint.MaxValue; |
| 4143 | rinfopack.RegionInfo2.MaxAgents32 = uint.MaxValue; | 4143 | rinfopack.RegionInfo2.MaxAgents32 = uint.MaxValue; |
| 4144 | rinfopack.RegionInfo2.ProductName = Utils.EmptyBytes; | 4144 | rinfopack.RegionInfo2.ProductName = Util.StringToBytes256(args.regionType); |
| 4145 | rinfopack.RegionInfo2.ProductSKU = Utils.EmptyBytes; | 4145 | rinfopack.RegionInfo2.ProductSKU = Utils.EmptyBytes; |
| 4146 | 4146 | ||
| 4147 | rinfopack.HasVariableBlocks = true; | 4147 | rinfopack.HasVariableBlocks = true; |