diff options
author | Adam Frisby | 2007-07-15 14:58:23 +0000 |
---|---|---|
committer | Adam Frisby | 2007-07-15 14:58:23 +0000 |
commit | 275d8c024739f69ec2fce59cffc2f8e19dffc5f0 (patch) | |
tree | e67204e9cce1d53c5eabad3c37ac9311ec65acfe | |
parent | * Fixed bug where UserServer SendKey would not be saved in configuration. (diff) | |
download | opensim-SC-275d8c024739f69ec2fce59cffc2f8e19dffc5f0.zip opensim-SC-275d8c024739f69ec2fce59cffc2f8e19dffc5f0.tar.gz opensim-SC-275d8c024739f69ec2fce59cffc2f8e19dffc5f0.tar.bz2 opensim-SC-275d8c024739f69ec2fce59cffc2f8e19dffc5f0.tar.xz |
* Adding example "NullStorage" DataStore engine.
5 files changed, 128 insertions, 1 deletions
diff --git a/OpenSim/Region/Environment/Interfaces/IRegionDataStore.cs b/OpenSim/Region/Environment/Interfaces/IRegionDataStore.cs index ff809b4..c068866 100644 --- a/OpenSim/Region/Environment/Interfaces/IRegionDataStore.cs +++ b/OpenSim/Region/Environment/Interfaces/IRegionDataStore.cs | |||
@@ -47,7 +47,7 @@ namespace OpenSim.Region.Interfaces | |||
47 | void Initialise(string filename, string dbname); | 47 | void Initialise(string filename, string dbname); |
48 | 48 | ||
49 | void StoreObject(SceneObject obj); | 49 | void StoreObject(SceneObject obj); |
50 | void DeleteObject(LLUUID uuid); | 50 | void RemoveObject(LLUUID uuid); |
51 | 51 | ||
52 | List<SceneObject> LoadObjects(); | 52 | List<SceneObject> LoadObjects(); |
53 | 53 | ||
diff --git a/OpenSim/Region/Environment/Scenes/SceneObject.cs b/OpenSim/Region/Environment/Scenes/SceneObject.cs index b488447..7992b17 100644 --- a/OpenSim/Region/Environment/Scenes/SceneObject.cs +++ b/OpenSim/Region/Environment/Scenes/SceneObject.cs | |||
@@ -111,6 +111,7 @@ namespace OpenSim.Region.Environment.Scenes | |||
111 | m_eventManager.OnBackup -= new EventManager.OnBackupDelegate(ProcessBackup); | 111 | m_eventManager.OnBackup -= new EventManager.OnBackupDelegate(ProcessBackup); |
112 | m_eventManager.OnParcelPrimCountUpdate -= new EventManager.OnParcelPrimCountUpdateDelegate(ProcessParcelPrimCountUpdate); | 112 | m_eventManager.OnParcelPrimCountUpdate -= new EventManager.OnParcelPrimCountUpdateDelegate(ProcessParcelPrimCountUpdate); |
113 | } | 113 | } |
114 | |||
114 | /// <summary> | 115 | /// <summary> |
115 | /// Processes backup | 116 | /// Processes backup |
116 | /// </summary> | 117 | /// </summary> |
diff --git a/OpenSim/Region/Storage/OpenSim.DataStore.NullStorage/NullDataStore.cs b/OpenSim/Region/Storage/OpenSim.DataStore.NullStorage/NullDataStore.cs new file mode 100644 index 0000000..b67ba93 --- /dev/null +++ b/OpenSim/Region/Storage/OpenSim.DataStore.NullStorage/NullDataStore.cs | |||
@@ -0,0 +1,65 @@ | |||
1 | using System; | ||
2 | using System.Collections.Generic; | ||
3 | using System.Text; | ||
4 | |||
5 | using OpenSim.Region.Environment.Scenes; | ||
6 | using OpenSim.Region.Environment; | ||
7 | using OpenSim.Region.Interfaces; | ||
8 | using OpenSim.Framework.Console; | ||
9 | using libsecondlife; | ||
10 | |||
11 | namespace OpenSim.DataStore.NullStorage | ||
12 | { | ||
13 | class NullDataStore : IRegionDataStore | ||
14 | { | ||
15 | public void Initialise(string dbfile, string dbname) | ||
16 | { | ||
17 | return; | ||
18 | } | ||
19 | |||
20 | public void StoreObject(SceneObject obj) | ||
21 | { | ||
22 | |||
23 | } | ||
24 | |||
25 | public void RemoveObject(LLUUID obj) | ||
26 | { | ||
27 | |||
28 | } | ||
29 | |||
30 | public List<SceneObject> LoadObjects() | ||
31 | { | ||
32 | return null; | ||
33 | } | ||
34 | |||
35 | public void StoreTerrain(double[,] ter) | ||
36 | { | ||
37 | |||
38 | } | ||
39 | |||
40 | public double[,] LoadTerrain() | ||
41 | { | ||
42 | return null; | ||
43 | } | ||
44 | |||
45 | public void RemoveParcel(uint id) | ||
46 | { | ||
47 | |||
48 | } | ||
49 | |||
50 | public void StoreParcel(OpenSim.Region.Environment.Parcel parcel) | ||
51 | { | ||
52 | |||
53 | } | ||
54 | |||
55 | public List<OpenSim.Region.Environment.Parcel> LoadParcels() | ||
56 | { | ||
57 | return null; | ||
58 | } | ||
59 | |||
60 | public void Shutdown() | ||
61 | { | ||
62 | |||
63 | } | ||
64 | } | ||
65 | } | ||
diff --git a/OpenSim/Region/Storage/OpenSim.DataStore.NullStorage/Properties/AssemblyInfo.cs b/OpenSim/Region/Storage/OpenSim.DataStore.NullStorage/Properties/AssemblyInfo.cs new file mode 100644 index 0000000..c0bd46d --- /dev/null +++ b/OpenSim/Region/Storage/OpenSim.DataStore.NullStorage/Properties/AssemblyInfo.cs | |||
@@ -0,0 +1,35 @@ | |||
1 | using System.Reflection; | ||
2 | using System.Runtime.CompilerServices; | ||
3 | using System.Runtime.InteropServices; | ||
4 | |||
5 | // General Information about an assembly is controlled through the following | ||
6 | // set of attributes. Change these attribute values to modify the information | ||
7 | // associated with an assembly. | ||
8 | [assembly: AssemblyTitle("OpenSim.DataStore.NullStorage")] | ||
9 | [assembly: AssemblyDescription("")] | ||
10 | [assembly: AssemblyConfiguration("")] | ||
11 | [assembly: AssemblyCompany("")] | ||
12 | [assembly: AssemblyProduct("OpenSim.DataStore.NullStorage")] | ||
13 | [assembly: AssemblyCopyright("Copyright © 2007")] | ||
14 | [assembly: AssemblyTrademark("")] | ||
15 | [assembly: AssemblyCulture("")] | ||
16 | |||
17 | // Setting ComVisible to false makes the types in this assembly not visible | ||
18 | // to COM components. If you need to access a type in this assembly from | ||
19 | // COM, set the ComVisible attribute to true on that type. | ||
20 | [assembly: ComVisible(false)] | ||
21 | |||
22 | // The following GUID is for the ID of the typelib if this project is exposed to COM | ||
23 | [assembly: Guid("b4a1656d-de22-4080-a970-fd8166acbf16")] | ||
24 | |||
25 | // Version information for an assembly consists of the following four values: | ||
26 | // | ||
27 | // Major Version | ||
28 | // Minor Version | ||
29 | // Build Number | ||
30 | // Revision | ||
31 | // | ||
32 | // You can specify all the values or you can default the Revision and Build Numbers | ||
33 | // by using the '*' as shown below: | ||
34 | [assembly: AssemblyVersion("1.0.0.0")] | ||
35 | [assembly: AssemblyFileVersion("1.0.0.0")] | ||
diff --git a/prebuild.xml b/prebuild.xml index f8afa22..1f7ff6e 100644 --- a/prebuild.xml +++ b/prebuild.xml | |||
@@ -177,6 +177,32 @@ | |||
177 | </Project> | 177 | </Project> |
178 | 178 | ||
179 | <!-- Storage Plug-ins --> | 179 | <!-- Storage Plug-ins --> |
180 | <Project name="OpenSim.DataStore.NullStorage" path="OpenSim/Region/Storage/OpenSim.DataStore.NullStorage" type="Library"> | ||
181 | <Configuration name="Debug"> | ||
182 | <Options> | ||
183 | <OutputPath>../../../../bin/</OutputPath> | ||
184 | </Options> | ||
185 | </Configuration> | ||
186 | <Configuration name="Release"> | ||
187 | <Options> | ||
188 | <OutputPath>../../../../bin/</OutputPath> | ||
189 | </Options> | ||
190 | </Configuration> | ||
191 | |||
192 | <ReferencePath>../../../../bin/</ReferencePath> | ||
193 | <Reference name="System" localCopy="false"/> | ||
194 | <Reference name="System.Xml"/> | ||
195 | <Reference name="Db4objects.Db4o.dll"/> | ||
196 | <Reference name="libsecondlife.dll"/> | ||
197 | <Reference name="OpenSim.Framework"/> | ||
198 | <Reference name="OpenSim.Region.Enviroment"/> | ||
199 | <Reference name="OpenSim.Framework.Console"/> | ||
200 | <Files> | ||
201 | <Match pattern="*.cs" recurse="true"/> | ||
202 | </Files> | ||
203 | </Project> | ||
204 | |||
205 | |||
180 | <Project name="OpenSim.Region.Storage.LocalStorageDb4o" path="OpenSim/Region/Storage/LocalStorageDb4o" type="Library"> | 206 | <Project name="OpenSim.Region.Storage.LocalStorageDb4o" path="OpenSim/Region/Storage/LocalStorageDb4o" type="Library"> |
181 | <Configuration name="Debug"> | 207 | <Configuration name="Debug"> |
182 | <Options> | 208 | <Options> |