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/CoreModules | |
| parent | refactor: make RezObject() more readable (diff) | |
| parent | Patch by Apelsin that fixes behaviour of llSetPos and llGetLocalPos for attac... (diff) | |
| download | opensim-SC-78f452050a25e563eb7067854c0c9179d8f62bf8.zip opensim-SC-78f452050a25e563eb7067854c0c9179d8f62bf8.tar.gz opensim-SC-78f452050a25e563eb7067854c0c9179d8f62bf8.tar.bz2 opensim-SC-78f452050a25e563eb7067854c0c9179d8f62bf8.tar.xz | |
Merge branch 'master' of ssh://opensimulator.org/var/git/opensim
Diffstat (limited to 'OpenSim/Region/CoreModules')
| -rw-r--r-- | OpenSim/Region/CoreModules/World/Estate/EstateManagementModule.cs | 1 |
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 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 | } |