diff options
author | John Hurliman | 2010-09-12 14:20:26 -0700 |
---|---|---|
committer | John Hurliman | 2010-09-12 14:20:26 -0700 |
commit | 0db1ed0b5a6f5bd104c6008f142d173c84263ce5 (patch) | |
tree | 05b1b67544242755ef0150d8134d549a1a0fcbe3 /OpenSim/ApplicationPlugins/RemoteController/RemoteAdminPlugin.cs | |
parent | Added a stub for OpenSim.Services.Connectors.Simulation.SimulationDataService... (diff) | |
download | opensim-SC-0db1ed0b5a6f5bd104c6008f142d173c84263ce5.zip opensim-SC-0db1ed0b5a6f5bd104c6008f142d173c84263ce5.tar.gz opensim-SC-0db1ed0b5a6f5bd104c6008f142d173c84263ce5.tar.bz2 opensim-SC-0db1ed0b5a6f5bd104c6008f142d173c84263ce5.tar.xz |
* Added ISimulationDataService and IEstateDataService
* Removed StorageManager
* CONFIG CHANGE: There are no more database settings in OpenSim.ini. Check the config-include configuration files for region store and estate store database settings
Diffstat (limited to 'OpenSim/ApplicationPlugins/RemoteController/RemoteAdminPlugin.cs')
-rw-r--r-- | OpenSim/ApplicationPlugins/RemoteController/RemoteAdminPlugin.cs | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/OpenSim/ApplicationPlugins/RemoteController/RemoteAdminPlugin.cs b/OpenSim/ApplicationPlugins/RemoteController/RemoteAdminPlugin.cs index 4b5710a..bb0a5b5 100644 --- a/OpenSim/ApplicationPlugins/RemoteController/RemoteAdminPlugin.cs +++ b/OpenSim/ApplicationPlugins/RemoteController/RemoteAdminPlugin.cs | |||
@@ -638,7 +638,7 @@ namespace OpenSim.ApplicationPlugins.RemoteController | |||
638 | // Set the estate | 638 | // Set the estate |
639 | 639 | ||
640 | // Check for an existing estate | 640 | // Check for an existing estate |
641 | List<int> estateIDs = m_application.StorageManager.EstateDataStore.GetEstates((string) requestData["estate_name"]); | 641 | List<int> estateIDs = m_application.EstateDataService.GetEstates((string) requestData["estate_name"]); |
642 | if (estateIDs.Count < 1) | 642 | if (estateIDs.Count < 1) |
643 | { | 643 | { |
644 | UUID userID = UUID.Zero; | 644 | UUID userID = UUID.Zero; |
@@ -666,7 +666,7 @@ namespace OpenSim.ApplicationPlugins.RemoteController | |||
666 | } | 666 | } |
667 | 667 | ||
668 | // Create a new estate with the name provided | 668 | // Create a new estate with the name provided |
669 | region.EstateSettings = m_application.StorageManager.EstateDataStore.LoadEstateSettings(region.RegionID, true); | 669 | region.EstateSettings = m_application.EstateDataService.LoadEstateSettings(region.RegionID, true); |
670 | 670 | ||
671 | region.EstateSettings.EstateName = (string) requestData["estate_name"]; | 671 | region.EstateSettings.EstateName = (string) requestData["estate_name"]; |
672 | region.EstateSettings.EstateOwner = userID; | 672 | region.EstateSettings.EstateOwner = userID; |
@@ -676,10 +676,10 @@ namespace OpenSim.ApplicationPlugins.RemoteController | |||
676 | else | 676 | else |
677 | { | 677 | { |
678 | int estateID = estateIDs[0]; | 678 | int estateID = estateIDs[0]; |
679 | 679 | ||
680 | region.EstateSettings = m_application.StorageManager.EstateDataStore.LoadEstateSettings(estateID); | 680 | region.EstateSettings = m_application.EstateDataService.LoadEstateSettings(estateID); |
681 | 681 | ||
682 | if (!m_application.StorageManager.EstateDataStore.LinkRegion(region.RegionID, estateID)) | 682 | if (!m_application.EstateDataService.LinkRegion(region.RegionID, estateID)) |
683 | throw new Exception("Failed to join estate."); | 683 | throw new Exception("Failed to join estate."); |
684 | } | 684 | } |
685 | 685 | ||