aboutsummaryrefslogtreecommitdiffstatshomepage
diff options
context:
space:
mode:
authorDr Scofield2009-07-03 15:36:47 +0000
committerDr Scofield2009-07-03 15:36:47 +0000
commit840f5f94859982413604a955cd47f9428b3a7c52 (patch)
treea1a8ca150c9a14ce3789067cc7152c5ce65b85e3
parentThank you kindly, AnakinLohner, for a patch that addresses: (diff)
downloadopensim-SC_OLD-840f5f94859982413604a955cd47f9428b3a7c52.zip
opensim-SC_OLD-840f5f94859982413604a955cd47f9428b3a7c52.tar.gz
opensim-SC_OLD-840f5f94859982413604a955cd47f9428b3a7c52.tar.bz2
opensim-SC_OLD-840f5f94859982413604a955cd47f9428b3a7c52.tar.xz
- adding a Persistent flag to RegionInfo
- adding EstateSettings.Save() to RemoteAdmin ACL code (invoked only when region is persistent)
-rw-r--r--OpenSim/ApplicationPlugins/RemoteController/RemoteAdminPlugin.cs13
-rw-r--r--OpenSim/Framework/RegionInfo.cs3
2 files changed, 15 insertions, 1 deletions
diff --git a/OpenSim/ApplicationPlugins/RemoteController/RemoteAdminPlugin.cs b/OpenSim/ApplicationPlugins/RemoteController/RemoteAdminPlugin.cs
index bcab2d1..23b1cc9 100644
--- a/OpenSim/ApplicationPlugins/RemoteController/RemoteAdminPlugin.cs
+++ b/OpenSim/ApplicationPlugins/RemoteController/RemoteAdminPlugin.cs
@@ -615,6 +615,10 @@ namespace OpenSim.ApplicationPlugins.RemoteController
615 m_log.DebugFormat("[RADMIN] CreateRegion: persisting region {0} to {1}", 615 m_log.DebugFormat("[RADMIN] CreateRegion: persisting region {0} to {1}",
616 region.RegionID, regionXmlPath); 616 region.RegionID, regionXmlPath);
617 region.SaveRegionToFile("dynamic region", regionXmlPath); 617 region.SaveRegionToFile("dynamic region", regionXmlPath);
618 }
619 else
620 {
621 region.Persistent = false;
618 } 622 }
619 623
620 // Create the region and perform any initial initialization 624 // Create the region and perform any initial initialization
@@ -785,7 +789,8 @@ namespace OpenSim.ApplicationPlugins.RemoteController
785 // Modify access 789 // Modify access
786 scene.RegionInfo.EstateSettings.PublicAccess = 790 scene.RegionInfo.EstateSettings.PublicAccess =
787 getBoolean(requestData,"public", scene.RegionInfo.EstateSettings.PublicAccess); 791 getBoolean(requestData,"public", scene.RegionInfo.EstateSettings.PublicAccess);
788 scene.RegionInfo.EstateSettings.Save(); 792 if (scene.RegionInfo.Persistent)
793 scene.RegionInfo.EstateSettings.Save();
789 794
790 if (requestData.ContainsKey("enable_voice")) 795 if (requestData.ContainsKey("enable_voice"))
791 { 796 {
@@ -2197,6 +2202,8 @@ namespace OpenSim.ApplicationPlugins.RemoteController
2197 2202
2198 Scene s = m_app.SceneManager.CurrentScene; 2203 Scene s = m_app.SceneManager.CurrentScene;
2199 s.RegionInfo.EstateSettings.EstateAccess = new UUID[]{}; 2204 s.RegionInfo.EstateSettings.EstateAccess = new UUID[]{};
2205 if (s.RegionInfo.Persistent)
2206 s.RegionInfo.EstateSettings.Save();
2200 2207
2201 } 2208 }
2202 catch (Exception e) 2209 catch (Exception e)
@@ -2278,6 +2285,8 @@ namespace OpenSim.ApplicationPlugins.RemoteController
2278 } 2285 }
2279 } 2286 }
2280 s.RegionInfo.EstateSettings.EstateAccess = acl.ToArray(); 2287 s.RegionInfo.EstateSettings.EstateAccess = acl.ToArray();
2288 if (s.RegionInfo.Persistent)
2289 s.RegionInfo.EstateSettings.Save();
2281 } 2290 }
2282 2291
2283 responseData["added"] = addk; 2292 responseData["added"] = addk;
@@ -2361,6 +2370,8 @@ namespace OpenSim.ApplicationPlugins.RemoteController
2361 } 2370 }
2362 } 2371 }
2363 s.RegionInfo.EstateSettings.EstateAccess = acl.ToArray(); 2372 s.RegionInfo.EstateSettings.EstateAccess = acl.ToArray();
2373 if (s.RegionInfo.Persistent)
2374 s.RegionInfo.EstateSettings.Save();
2364 } 2375 }
2365 2376
2366 responseData["removed"] = remk; 2377 responseData["removed"] = remk;
diff --git a/OpenSim/Framework/RegionInfo.cs b/OpenSim/Framework/RegionInfo.cs
index 7ac1e62..8f9b551 100644
--- a/OpenSim/Framework/RegionInfo.cs
+++ b/OpenSim/Framework/RegionInfo.cs
@@ -209,6 +209,8 @@ namespace OpenSim.Framework
209 public string DataStore = String.Empty; 209 public string DataStore = String.Empty;
210 public string RegionFile = String.Empty; 210 public string RegionFile = String.Empty;
211 public bool isSandbox = false; 211 public bool isSandbox = false;
212 public bool Persistent = true;
213
212 private EstateSettings m_estateSettings; 214 private EstateSettings m_estateSettings;
213 private RegionSettings m_regionSettings; 215 private RegionSettings m_regionSettings;
214 // private IConfigSource m_configSource = null; 216 // private IConfigSource m_configSource = null;
@@ -233,6 +235,7 @@ namespace OpenSim.Framework
233 private bool m_clampPrimSize = false; 235 private bool m_clampPrimSize = false;
234 private int m_objectCapacity = 0; 236 private int m_objectCapacity = 0;
235 237
238
236 // Apparently, we're applying the same estatesettings regardless of whether it's local or remote. 239 // Apparently, we're applying the same estatesettings regardless of whether it's local or remote.
237 240
238 // MT: Yes. Estates can't span trust boundaries. Therefore, it can be 241 // MT: Yes. Estates can't span trust boundaries. Therefore, it can be