aboutsummaryrefslogtreecommitdiffstatshomepage
diff options
context:
space:
mode:
authorMelanie2010-08-24 12:41:21 +0100
committerMelanie2010-08-24 12:41:21 +0100
commitde85aabcbe51472a34b83943d0993e25b63ca074 (patch)
treeb3dacc665c2e47cb9790434b1d6fe4819ca0c7a2
parentAdd system lookup folder fix to the RemoveXInventoryServiceConnector as well ... (diff)
downloadopensim-SC_OLD-de85aabcbe51472a34b83943d0993e25b63ca074.zip
opensim-SC_OLD-de85aabcbe51472a34b83943d0993e25b63ca074.tar.gz
opensim-SC_OLD-de85aabcbe51472a34b83943d0993e25b63ca074.tar.bz2
opensim-SC_OLD-de85aabcbe51472a34b83943d0993e25b63ca074.tar.xz
Plumb the region type through to the ProductName field in estate messages
-rw-r--r--OpenSim/Framework/RegionInfoForEstateMenuArgs.cs3
-rw-r--r--OpenSim/Region/ClientStack/LindenUDP/LLClientView.cs4
-rw-r--r--OpenSim/Region/CoreModules/World/Estate/EstateManagementModule.cs1
3 files changed, 5 insertions, 3 deletions
diff --git a/OpenSim/Framework/RegionInfoForEstateMenuArgs.cs b/OpenSim/Framework/RegionInfoForEstateMenuArgs.cs
index fee3126..f274da2 100644
--- a/OpenSim/Framework/RegionInfoForEstateMenuArgs.cs
+++ b/OpenSim/Framework/RegionInfoForEstateMenuArgs.cs
@@ -47,5 +47,6 @@ namespace OpenSim.Framework
47 public bool useEstateSun; 47 public bool useEstateSun;
48 public float waterHeight; 48 public float waterHeight;
49 public string simName; 49 public string simName;
50 public string regionType;
50 } 51 }
51} \ No newline at end of file 52}
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;
diff --git a/OpenSim/Region/CoreModules/World/Estate/EstateManagementModule.cs b/OpenSim/Region/CoreModules/World/Estate/EstateManagementModule.cs
index 51f2c41..5025c88 100644
--- a/OpenSim/Region/CoreModules/World/Estate/EstateManagementModule.cs
+++ b/OpenSim/Region/CoreModules/World/Estate/EstateManagementModule.cs
@@ -670,6 +670,7 @@ namespace OpenSim.Region.CoreModules.World.Estate
670 args.useEstateSun = m_scene.RegionInfo.RegionSettings.UseEstateSun; 670 args.useEstateSun = m_scene.RegionInfo.RegionSettings.UseEstateSun;
671 args.waterHeight = (float)m_scene.RegionInfo.RegionSettings.WaterHeight; 671 args.waterHeight = (float)m_scene.RegionInfo.RegionSettings.WaterHeight;
672 args.simName = m_scene.RegionInfo.RegionName; 672 args.simName = m_scene.RegionInfo.RegionName;
673 args.regionType = m_scene.RegionInfo.RegionType;
673 674
674 remote_client.SendRegionInfoToEstateMenu(args); 675 remote_client.SendRegionInfoToEstateMenu(args);
675 } 676 }