diff options
| author | Justin Clark-Casey (justincc) | 2010-08-24 22:29:32 +0100 |
|---|---|---|
| committer | Justin Clark-Casey (justincc) | 2010-08-24 22:29:32 +0100 |
| commit | 78f452050a25e563eb7067854c0c9179d8f62bf8 (patch) | |
| tree | 4dae082a6c5dc116dc5356cc0b2066bb9a39d50c /OpenSim/Region/ClientStack | |
| parent | refactor: make RezObject() more readable (diff) | |
| parent | Patch by Apelsin that fixes behaviour of llSetPos and llGetLocalPos for attac... (diff) | |
| download | opensim-SC_OLD-78f452050a25e563eb7067854c0c9179d8f62bf8.zip opensim-SC_OLD-78f452050a25e563eb7067854c0c9179d8f62bf8.tar.gz opensim-SC_OLD-78f452050a25e563eb7067854c0c9179d8f62bf8.tar.bz2 opensim-SC_OLD-78f452050a25e563eb7067854c0c9179d8f62bf8.tar.xz | |
Merge branch 'master' of ssh://opensimulator.org/var/git/opensim
Diffstat (limited to '')
| -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 db81fb9..320a2fa 100644 --- a/OpenSim/Region/ClientStack/LindenUDP/LLClientView.cs +++ b/OpenSim/Region/ClientStack/LindenUDP/LLClientView.cs | |||
| @@ -717,7 +717,7 @@ namespace OpenSim.Region.ClientStack.LindenUDP | |||
| 717 | handshake.RegionInfo3.CPURatio = 1; | 717 | handshake.RegionInfo3.CPURatio = 1; |
| 718 | 718 | ||
| 719 | handshake.RegionInfo3.ColoName = Utils.EmptyBytes; | 719 | handshake.RegionInfo3.ColoName = Utils.EmptyBytes; |
| 720 | handshake.RegionInfo3.ProductName = Utils.EmptyBytes; | 720 | handshake.RegionInfo3.ProductName = Util.StringToBytes256(regionInfo.RegionType); |
| 721 | handshake.RegionInfo3.ProductSKU = Utils.EmptyBytes; | 721 | handshake.RegionInfo3.ProductSKU = Utils.EmptyBytes; |
| 722 | 722 | ||
| 723 | OutPacket(handshake, ThrottleOutPacketType.Task); | 723 | OutPacket(handshake, ThrottleOutPacketType.Task); |
| @@ -4106,7 +4106,7 @@ namespace OpenSim.Region.ClientStack.LindenUDP | |||
| 4106 | rinfopack.RegionInfo2.HardMaxAgents = uint.MaxValue; | 4106 | rinfopack.RegionInfo2.HardMaxAgents = uint.MaxValue; |
| 4107 | rinfopack.RegionInfo2.HardMaxObjects = uint.MaxValue; | 4107 | rinfopack.RegionInfo2.HardMaxObjects = uint.MaxValue; |
| 4108 | rinfopack.RegionInfo2.MaxAgents32 = uint.MaxValue; | 4108 | rinfopack.RegionInfo2.MaxAgents32 = uint.MaxValue; |
| 4109 | rinfopack.RegionInfo2.ProductName = Utils.EmptyBytes; | 4109 | rinfopack.RegionInfo2.ProductName = Util.StringToBytes256(args.regionType); |
| 4110 | rinfopack.RegionInfo2.ProductSKU = Utils.EmptyBytes; | 4110 | rinfopack.RegionInfo2.ProductSKU = Utils.EmptyBytes; |
| 4111 | 4111 | ||
| 4112 | rinfopack.HasVariableBlocks = true; | 4112 | rinfopack.HasVariableBlocks = true; |