aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Region/CoreModules/World
diff options
context:
space:
mode:
authorMelanie2010-08-24 17:37:11 +0100
committerMelanie2010-08-24 17:37:11 +0100
commit483fc88b07b2f7d4f89c021fbb5883e0494b3244 (patch)
tree34bf6f8c94b225990a4bee035984f02e0cea7055 /OpenSim/Region/CoreModules/World
parentMerge branch 'master' into careminster-presence-refactor (diff)
parentPlumb the region type through to the ProductName field in estate messages (diff)
downloadopensim-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/CoreModules/World')
-rw-r--r--OpenSim/Region/CoreModules/World/Estate/EstateManagementModule.cs1
1 files changed, 1 insertions, 0 deletions
diff --git a/OpenSim/Region/CoreModules/World/Estate/EstateManagementModule.cs b/OpenSim/Region/CoreModules/World/Estate/EstateManagementModule.cs
index 171e0b9..6e7971e 100644
--- a/OpenSim/Region/CoreModules/World/Estate/EstateManagementModule.cs
+++ b/OpenSim/Region/CoreModules/World/Estate/EstateManagementModule.cs
@@ -672,6 +672,7 @@ namespace OpenSim.Region.CoreModules.World.Estate
672 args.useEstateSun = m_scene.RegionInfo.RegionSettings.UseEstateSun; 672 args.useEstateSun = m_scene.RegionInfo.RegionSettings.UseEstateSun;
673 args.waterHeight = (float)m_scene.RegionInfo.RegionSettings.WaterHeight; 673 args.waterHeight = (float)m_scene.RegionInfo.RegionSettings.WaterHeight;
674 args.simName = m_scene.RegionInfo.RegionName; 674 args.simName = m_scene.RegionInfo.RegionName;
675 args.regionType = m_scene.RegionInfo.RegionType;
675 676
676 remote_client.SendRegionInfoToEstateMenu(args); 677 remote_client.SendRegionInfoToEstateMenu(args);
677 } 678 }