aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Region/Environment/Modules/World/Estate
diff options
context:
space:
mode:
authorJustin Clarke Casey2008-12-30 19:00:19 +0000
committerJustin Clarke Casey2008-12-30 19:00:19 +0000
commitf0ea8eb53463fe7e228537779f3f700bc6ecb74d (patch)
tree33f1a11a0dc4817557fd0578329ee7249c058371 /OpenSim/Region/Environment/Modules/World/Estate
parentOpenUser_Main is now public. Fixes Mantis #2940. Thanks SirKimba (diff)
downloadopensim-SC-f0ea8eb53463fe7e228537779f3f700bc6ecb74d.zip
opensim-SC-f0ea8eb53463fe7e228537779f3f700bc6ecb74d.tar.gz
opensim-SC-f0ea8eb53463fe7e228537779f3f700bc6ecb74d.tar.bz2
opensim-SC-f0ea8eb53463fe7e228537779f3f700bc6ecb74d.tar.xz
* Implement saving of region settings in OAR files
* This means that you can now save terrain textures, water height, etc. * Estate settings are not supported * Older OAR files without these settings can still be loaded
Diffstat (limited to 'OpenSim/Region/Environment/Modules/World/Estate')
-rw-r--r--OpenSim/Region/Environment/Modules/World/Estate/EstateManagementModule.cs5
1 files changed, 1 insertions, 4 deletions
diff --git a/OpenSim/Region/Environment/Modules/World/Estate/EstateManagementModule.cs b/OpenSim/Region/Environment/Modules/World/Estate/EstateManagementModule.cs
index 7945815..14450ae 100644
--- a/OpenSim/Region/Environment/Modules/World/Estate/EstateManagementModule.cs
+++ b/OpenSim/Region/Environment/Modules/World/Estate/EstateManagementModule.cs
@@ -562,7 +562,6 @@ namespace OpenSim.Region.Environment.Modules.World.Estate
562 562
563 private void HandleRegionInfoRequest(IClientAPI remote_client) 563 private void HandleRegionInfoRequest(IClientAPI remote_client)
564 { 564 {
565
566 RegionInfoForEstateMenuArgs args = new RegionInfoForEstateMenuArgs(); 565 RegionInfoForEstateMenuArgs args = new RegionInfoForEstateMenuArgs();
567 args.billableFactor = m_scene.RegionInfo.EstateSettings.BillableFactor; 566 args.billableFactor = m_scene.RegionInfo.EstateSettings.BillableFactor;
568 args.estateID = m_scene.RegionInfo.EstateSettings.EstateID; 567 args.estateID = m_scene.RegionInfo.EstateSettings.EstateID;
@@ -754,9 +753,7 @@ namespace OpenSim.Region.Environment.Modules.World.Estate
754 753
755 public void sendRegionHandshakeToAll() 754 public void sendRegionHandshakeToAll()
756 { 755 {
757 m_scene.Broadcast( 756 m_scene.Broadcast(sendRegionHandshake);
758 sendRegionHandshake
759 );
760 } 757 }
761 758
762 public void handleEstateChangeInfo(IClientAPI remoteClient, UUID invoice, UUID senderID, UInt32 parms1, UInt32 parms2) 759 public void handleEstateChangeInfo(IClientAPI remoteClient, UUID invoice, UUID senderID, UInt32 parms1, UInt32 parms2)