From 2ff9ea3f8038653135c284cc0c93d88690db9a22 Mon Sep 17 00:00:00 2001
From: Diva Canto
Date: Sun, 1 Jun 2014 10:06:26 -0700
Subject: Fixed a few things pertaining to interfacing with the estate service.
 Specifically, StoreEstateSettings was not being used anywhere; instead
 EstatSetting.Save was being called, but that method is a trigger to the
 DB-layer code directly, which, besides being wrong, was making it impossible
 to replace the service with a remote connector. Also added more
 packing/unpacking code.

---
 OpenSim/ApplicationPlugins/LoadRegions/LoadRegionsPlugin.cs  |  3 ++-
 .../ApplicationPlugins/RemoteController/RemoteAdminPlugin.cs | 12 ++++++------
 2 files changed, 8 insertions(+), 7 deletions(-)

(limited to 'OpenSim/ApplicationPlugins')

diff --git a/OpenSim/ApplicationPlugins/LoadRegions/LoadRegionsPlugin.cs b/OpenSim/ApplicationPlugins/LoadRegions/LoadRegionsPlugin.cs
index 1d63d26..3455411 100644
--- a/OpenSim/ApplicationPlugins/LoadRegions/LoadRegionsPlugin.cs
+++ b/OpenSim/ApplicationPlugins/LoadRegions/LoadRegionsPlugin.cs
@@ -39,6 +39,7 @@ using OpenSim.Region.CoreModules.Avatar.InstantMessage;
 using OpenSim.Region.CoreModules.Scripting.DynamicTexture;
 using OpenSim.Region.CoreModules.Scripting.LoadImageURL;
 using OpenSim.Region.CoreModules.Scripting.XMLRPC;
+using OpenSim.Services.Interfaces;
 
 namespace OpenSim.ApplicationPlugins.LoadRegions
 {
@@ -130,7 +131,7 @@ namespace OpenSim.ApplicationPlugins.LoadRegions
                 createdScenes.Add(scene);
 
                 if (changed)
-                    regionsToLoad[i].EstateSettings.Save();
+                    m_openSim.EstateDataService.StoreEstateSettings(regionsToLoad[i].EstateSettings);
             }
 
             foreach (IScene scene in createdScenes)
diff --git a/OpenSim/ApplicationPlugins/RemoteController/RemoteAdminPlugin.cs b/OpenSim/ApplicationPlugins/RemoteController/RemoteAdminPlugin.cs
index e011232..44da48a 100644
--- a/OpenSim/ApplicationPlugins/RemoteController/RemoteAdminPlugin.cs
+++ b/OpenSim/ApplicationPlugins/RemoteController/RemoteAdminPlugin.cs
@@ -694,7 +694,7 @@ namespace OpenSim.ApplicationPlugins.RemoteController
                     region.EstateSettings.EstateName = (string) requestData["estate_name"];
                     region.EstateSettings.EstateOwner = userID;
                     // Persistence does not seem to effect the need to save a new estate
-                    region.EstateSettings.Save();
+                    m_application.EstateDataService.StoreEstateSettings(region.EstateSettings);
 
                     if (!m_application.EstateDataService.LinkRegion(region.RegionID, (int) region.EstateSettings.EstateID))
                         throw new Exception("Failed to join estate.");
@@ -724,7 +724,7 @@ namespace OpenSim.ApplicationPlugins.RemoteController
                 // If an access specification was provided, use it.
                 // Otherwise accept the default.
                 newScene.RegionInfo.EstateSettings.PublicAccess = GetBoolean(requestData, "public", m_publicAccess);
-                newScene.RegionInfo.EstateSettings.Save();
+                m_application.EstateDataService.StoreEstateSettings(newScene.RegionInfo.EstateSettings);
 
                 // enable voice on newly created region if
                 // requested by either the XmlRpc request or the
@@ -910,7 +910,7 @@ namespace OpenSim.ApplicationPlugins.RemoteController
                 scene.RegionInfo.EstateSettings.PublicAccess =
                     GetBoolean(requestData,"public", scene.RegionInfo.EstateSettings.PublicAccess);
                 if (scene.RegionInfo.Persistent)
-                    scene.RegionInfo.EstateSettings.Save();
+                    m_application.EstateDataService.StoreEstateSettings(scene.RegionInfo.EstateSettings);
 
                 if (requestData.ContainsKey("enable_voice"))
                 {
@@ -1792,7 +1792,7 @@ namespace OpenSim.ApplicationPlugins.RemoteController
             scene.RegionInfo.EstateSettings.EstateAccess = new UUID[]{};
 
             if (scene.RegionInfo.Persistent)
-                scene.RegionInfo.EstateSettings.Save();
+                m_application.EstateDataService.StoreEstateSettings(scene.RegionInfo.EstateSettings);
 
             m_log.Info("[RADMIN]: Access List Clear Request complete");
         }
@@ -1838,7 +1838,7 @@ namespace OpenSim.ApplicationPlugins.RemoteController
                 }
                 scene.RegionInfo.EstateSettings.EstateAccess = accessControlList.ToArray();
                 if (scene.RegionInfo.Persistent)
-                    scene.RegionInfo.EstateSettings.Save();
+                    m_application.EstateDataService.StoreEstateSettings(scene.RegionInfo.EstateSettings);
             }
 
             responseData["added"] = addedUsers;
@@ -1887,7 +1887,7 @@ namespace OpenSim.ApplicationPlugins.RemoteController
                 }
                 scene.RegionInfo.EstateSettings.EstateAccess = accessControlList.ToArray();
                 if (scene.RegionInfo.Persistent)
-                    scene.RegionInfo.EstateSettings.Save();
+                    m_application.EstateDataService.StoreEstateSettings(scene.RegionInfo.EstateSettings);
             }
 
             responseData["removed"] = removedUsers;
-- 
cgit v1.1