diff options
author | John Hurliman | 2010-09-12 00:30:13 -0700 |
---|---|---|
committer | John Hurliman | 2010-09-12 00:30:13 -0700 |
commit | 16d782eaa25e73e39b8aaa02383592ac4813a109 (patch) | |
tree | 1831f37acdf12aec7f5a4a1710ed4d2cbc12b087 /OpenSim/Region/Framework | |
parent | Shuffling fields and properties around in Scene to make Scene.cs more readable (diff) | |
download | opensim-SC_OLD-16d782eaa25e73e39b8aaa02383592ac4813a109.zip opensim-SC_OLD-16d782eaa25e73e39b8aaa02383592ac4813a109.tar.gz opensim-SC_OLD-16d782eaa25e73e39b8aaa02383592ac4813a109.tar.bz2 opensim-SC_OLD-16d782eaa25e73e39b8aaa02383592ac4813a109.tar.xz |
Added a stub for OpenSim.Services.Connectors.Simulation.SimulationDataServiceConnector
Diffstat (limited to '')
-rw-r--r-- | OpenSim/Region/Framework/Interfaces/ISimulationDataService.cs | 98 | ||||
-rw-r--r-- | OpenSim/Region/Framework/StorageManager.cs | 24 |
2 files changed, 102 insertions, 20 deletions
diff --git a/OpenSim/Region/Framework/Interfaces/ISimulationDataService.cs b/OpenSim/Region/Framework/Interfaces/ISimulationDataService.cs new file mode 100644 index 0000000..edaa07c --- /dev/null +++ b/OpenSim/Region/Framework/Interfaces/ISimulationDataService.cs | |||
@@ -0,0 +1,98 @@ | |||
1 | /* | ||
2 | * Copyright (c) Contributors, http://opensimulator.org/ | ||
3 | * See CONTRIBUTORS.TXT for a full list of copyright holders. | ||
4 | * | ||
5 | * Redistribution and use in source and binary forms, with or without | ||
6 | * modification, are permitted provided that the following conditions are met: | ||
7 | * * Redistributions of source code must retain the above copyright | ||
8 | * notice, this list of conditions and the following disclaimer. | ||
9 | * * Redistributions in binary form must reproduce the above copyright | ||
10 | * notice, this list of conditions and the following disclaimer in the | ||
11 | * documentation and/or other materials provided with the distribution. | ||
12 | * * Neither the name of the OpenSimulator Project nor the | ||
13 | * names of its contributors may be used to endorse or promote products | ||
14 | * derived from this software without specific prior written permission. | ||
15 | * | ||
16 | * THIS SOFTWARE IS PROVIDED BY THE DEVELOPERS ``AS IS'' AND ANY | ||
17 | * EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED | ||
18 | * WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE | ||
19 | * DISCLAIMED. IN NO EVENT SHALL THE CONTRIBUTORS BE LIABLE FOR ANY | ||
20 | * DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES | ||
21 | * (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; | ||
22 | * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND | ||
23 | * ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT | ||
24 | * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS | ||
25 | * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. | ||
26 | */ | ||
27 | |||
28 | using System; | ||
29 | using System.Collections.Generic; | ||
30 | using OpenMetaverse; | ||
31 | using OpenSim.Framework; | ||
32 | using OpenSim.Region.Framework.Scenes; | ||
33 | |||
34 | namespace OpenSim.Region.Framework.Interfaces | ||
35 | { | ||
36 | public interface ISimulationDataService | ||
37 | { | ||
38 | /// <summary> | ||
39 | /// Stores all object's details apart from inventory | ||
40 | /// </summary> | ||
41 | /// <param name="obj"></param> | ||
42 | /// <param name="regionUUID"></param> | ||
43 | void StoreObject(SceneObjectGroup obj, UUID regionUUID); | ||
44 | |||
45 | /// <summary> | ||
46 | /// Entirely removes the object, including inventory | ||
47 | /// </summary> | ||
48 | /// <param name="uuid"></param> | ||
49 | /// <param name="regionUUID"></param> | ||
50 | /// <returns></returns> | ||
51 | void RemoveObject(UUID uuid, UUID regionUUID); | ||
52 | |||
53 | /// <summary> | ||
54 | /// Store a prim's inventory | ||
55 | /// </summary> | ||
56 | /// <returns></returns> | ||
57 | void StorePrimInventory(UUID primID, ICollection<TaskInventoryItem> items); | ||
58 | |||
59 | /// <summary> | ||
60 | /// Load persisted objects from region storage. | ||
61 | /// </summary> | ||
62 | /// <param name="regionUUID">the Region UUID</param> | ||
63 | /// <returns>List of loaded groups</returns> | ||
64 | List<SceneObjectGroup> LoadObjects(UUID regionUUID); | ||
65 | |||
66 | /// <summary> | ||
67 | /// Store a terrain revision in region storage | ||
68 | /// </summary> | ||
69 | /// <param name="ter">HeightField data</param> | ||
70 | /// <param name="regionID">region UUID</param> | ||
71 | void StoreTerrain(double[,] terrain, UUID regionID); | ||
72 | |||
73 | /// <summary> | ||
74 | /// Load the latest terrain revision from region storage | ||
75 | /// </summary> | ||
76 | /// <param name="regionID">the region UUID</param> | ||
77 | /// <returns>Heightfield data</returns> | ||
78 | double[,] LoadTerrain(UUID regionID); | ||
79 | |||
80 | void StoreLandObject(ILandObject Parcel); | ||
81 | |||
82 | /// <summary> | ||
83 | /// <list type="bullet"> | ||
84 | /// <item>delete from land where UUID=globalID</item> | ||
85 | /// <item>delete from landaccesslist where LandUUID=globalID</item> | ||
86 | /// </list> | ||
87 | /// </summary> | ||
88 | /// <param name="globalID"></param> | ||
89 | void RemoveLandObject(UUID globalID); | ||
90 | |||
91 | List<LandData> LoadLandObjects(UUID regionUUID); | ||
92 | |||
93 | void StoreRegionSettings(RegionSettings rs); | ||
94 | RegionSettings LoadRegionSettings(UUID regionUUID); | ||
95 | RegionLightShareData LoadRegionWindlightSettings(UUID regionUUID); | ||
96 | void StoreRegionWindlightSettings(RegionLightShareData wl); | ||
97 | } | ||
98 | } | ||
diff --git a/OpenSim/Region/Framework/StorageManager.cs b/OpenSim/Region/Framework/StorageManager.cs index 47db2b3..c858d56 100644 --- a/OpenSim/Region/Framework/StorageManager.cs +++ b/OpenSim/Region/Framework/StorageManager.cs | |||
@@ -36,24 +36,8 @@ namespace OpenSim.Region.Framework | |||
36 | { | 36 | { |
37 | private static readonly ILog m_log = LogManager.GetLogger(MethodBase.GetCurrentMethod().DeclaringType); | 37 | private static readonly ILog m_log = LogManager.GetLogger(MethodBase.GetCurrentMethod().DeclaringType); |
38 | 38 | ||
39 | protected ISimulationDataStore m_dataStore; | 39 | public readonly ISimulationDataStore DataStore; |
40 | 40 | public readonly IEstateDataStore EstateDataStore; | |
41 | public ISimulationDataStore DataStore | ||
42 | { | ||
43 | get { return m_dataStore; } | ||
44 | } | ||
45 | |||
46 | private IEstateDataStore m_estateDataStore; | ||
47 | |||
48 | public IEstateDataStore EstateDataStore | ||
49 | { | ||
50 | get { return m_estateDataStore; } | ||
51 | } | ||
52 | |||
53 | public StorageManager(ISimulationDataStore storage) | ||
54 | { | ||
55 | m_dataStore = storage; | ||
56 | } | ||
57 | 41 | ||
58 | public StorageManager(string dllName, string connectionstring, string estateconnectionstring) | 42 | public StorageManager(string dllName, string connectionstring, string estateconnectionstring) |
59 | { | 43 | { |
@@ -72,7 +56,7 @@ namespace OpenSim.Region.Framework | |||
72 | (ISimulationDataStore)Activator.CreateInstance(pluginAssembly.GetType(pluginType.ToString())); | 56 | (ISimulationDataStore)Activator.CreateInstance(pluginAssembly.GetType(pluginType.ToString())); |
73 | plug.Initialise(connectionstring); | 57 | plug.Initialise(connectionstring); |
74 | 58 | ||
75 | m_dataStore = plug; | 59 | DataStore = plug; |
76 | 60 | ||
77 | m_log.Info("[DATASTORE]: Added ISimulationDataStore Interface"); | 61 | m_log.Info("[DATASTORE]: Added ISimulationDataStore Interface"); |
78 | } | 62 | } |
@@ -85,7 +69,7 @@ namespace OpenSim.Region.Framework | |||
85 | (IEstateDataStore) Activator.CreateInstance(pluginAssembly.GetType(pluginType.ToString())); | 69 | (IEstateDataStore) Activator.CreateInstance(pluginAssembly.GetType(pluginType.ToString())); |
86 | estPlug.Initialise(estateconnectionstring); | 70 | estPlug.Initialise(estateconnectionstring); |
87 | 71 | ||
88 | m_estateDataStore = estPlug; | 72 | EstateDataStore = estPlug; |
89 | } | 73 | } |
90 | } | 74 | } |
91 | } | 75 | } |