Merge branch 'careminster-presence-refactor' of ssh://3dhosting.de/var/git/careminster into careminster-presence-refactor

This commit is contained in:
meta7
2010-08-30 11:42:17 -07:00
81 changed files with 3201 additions and 2665 deletions

View File

@@ -684,6 +684,7 @@ namespace OpenSim.Region.CoreModules.World.Estate
args.useEstateSun = m_scene.RegionInfo.RegionSettings.UseEstateSun;
args.waterHeight = (float)m_scene.RegionInfo.RegionSettings.WaterHeight;
args.simName = m_scene.RegionInfo.RegionName;
args.regionType = m_scene.RegionInfo.RegionType;
remote_client.SendRegionInfoToEstateMenu(args);
}