diff options
author | Diva Canto | 2014-06-01 10:06:26 -0700 |
---|---|---|
committer | Diva Canto | 2014-06-01 10:06:26 -0700 |
commit | 2ff9ea3f8038653135c284cc0c93d88690db9a22 (patch) | |
tree | 34448f055a3577311e147503536260337a8d4719 /OpenSim/ApplicationPlugins/LoadRegions/LoadRegionsPlugin.cs | |
parent | Fix a bug where estate not found would result in a dummy estate record with e... (diff) | |
download | opensim-SC-2ff9ea3f8038653135c284cc0c93d88690db9a22.zip opensim-SC-2ff9ea3f8038653135c284cc0c93d88690db9a22.tar.gz opensim-SC-2ff9ea3f8038653135c284cc0c93d88690db9a22.tar.bz2 opensim-SC-2ff9ea3f8038653135c284cc0c93d88690db9a22.tar.xz |
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.
Diffstat (limited to '')
-rw-r--r-- | OpenSim/ApplicationPlugins/LoadRegions/LoadRegionsPlugin.cs | 3 |
1 files changed, 2 insertions, 1 deletions
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; | |||
39 | using OpenSim.Region.CoreModules.Scripting.DynamicTexture; | 39 | using OpenSim.Region.CoreModules.Scripting.DynamicTexture; |
40 | using OpenSim.Region.CoreModules.Scripting.LoadImageURL; | 40 | using OpenSim.Region.CoreModules.Scripting.LoadImageURL; |
41 | using OpenSim.Region.CoreModules.Scripting.XMLRPC; | 41 | using OpenSim.Region.CoreModules.Scripting.XMLRPC; |
42 | using OpenSim.Services.Interfaces; | ||
42 | 43 | ||
43 | namespace OpenSim.ApplicationPlugins.LoadRegions | 44 | namespace OpenSim.ApplicationPlugins.LoadRegions |
44 | { | 45 | { |
@@ -130,7 +131,7 @@ namespace OpenSim.ApplicationPlugins.LoadRegions | |||
130 | createdScenes.Add(scene); | 131 | createdScenes.Add(scene); |
131 | 132 | ||
132 | if (changed) | 133 | if (changed) |
133 | regionsToLoad[i].EstateSettings.Save(); | 134 | m_openSim.EstateDataService.StoreEstateSettings(regionsToLoad[i].EstateSettings); |
134 | } | 135 | } |
135 | 136 | ||
136 | foreach (IScene scene in createdScenes) | 137 | foreach (IScene scene in createdScenes) |