diff options
author | Adam Frisby | 2007-07-19 00:29:50 +0000 |
---|---|---|
committer | Adam Frisby | 2007-07-19 00:29:50 +0000 |
commit | f29acf95b0f8ac99a4a59e833186a543d73f9624 (patch) | |
tree | 78a5dc95478dc86797c164811719010b46dbec92 /OpenSim/Region | |
parent | * Removing more compiler warnings (diff) | |
download | opensim-SC_OLD-f29acf95b0f8ac99a4a59e833186a543d73f9624.zip opensim-SC_OLD-f29acf95b0f8ac99a4a59e833186a543d73f9624.tar.gz opensim-SC_OLD-f29acf95b0f8ac99a4a59e833186a543d73f9624.tar.bz2 opensim-SC_OLD-f29acf95b0f8ac99a4a59e833186a543d73f9624.tar.xz |
* Removed yet more compiler warnings
* Dropped old ILocalStorage storage engines.
Diffstat (limited to 'OpenSim/Region')
8 files changed, 0 insertions, 826 deletions
diff --git a/OpenSim/Region/Storage/LocalStorageBerkeleyDB/BDBLocalStorage.cs b/OpenSim/Region/Storage/LocalStorageBerkeleyDB/BDBLocalStorage.cs deleted file mode 100644 index 1c0a4a3..0000000 --- a/OpenSim/Region/Storage/LocalStorageBerkeleyDB/BDBLocalStorage.cs +++ /dev/null | |||
@@ -1,112 +0,0 @@ | |||
1 | /* | ||
2 | * Copyright (c) Contributors, http://www.openmetaverse.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 OpenSim 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 | |||
29 | // BDB Support | ||
30 | // Apparently broken on Mono | ||
31 | |||
32 | using BerkeleyDb; | ||
33 | using libsecondlife; | ||
34 | using OpenSim.Framework.Interfaces; | ||
35 | using OpenSim.Framework.Types; | ||
36 | |||
37 | namespace OpenSim.Region.Storage.LocalStorageBDB | ||
38 | { | ||
39 | public class BDBLocalStorage : ILocalStorage | ||
40 | { | ||
41 | const string simDbName = "localsim.db"; | ||
42 | |||
43 | DbHash sim; | ||
44 | Db DB; | ||
45 | //BEFormatter formatter; | ||
46 | |||
47 | public BDBLocalStorage() | ||
48 | { | ||
49 | DB = new Db(DbCreateFlags.None); | ||
50 | sim = (DbHash)DB.Open(null, simDbName, null, DbType.Hash, Db.OpenFlags.Create, 0); | ||
51 | //vendorDb = (DbBTree)db.Open(null, VendorDbName, null, DbType.BTree, Db.OpenFlags.Create, 0); | ||
52 | } | ||
53 | |||
54 | public void Initialise(string file) | ||
55 | { | ||
56 | // Blank | ||
57 | } | ||
58 | |||
59 | public void StorePrim(PrimData prim) | ||
60 | { | ||
61 | DbEntry key = new DbEntry(); | ||
62 | DbEntry data = new DbEntry(); | ||
63 | lock (sim) | ||
64 | { | ||
65 | sim.PutUnique(null, ref key, ref data, DbFile.WriteFlags.AutoCommit); | ||
66 | } | ||
67 | } | ||
68 | public void RemovePrim(LLUUID primID) | ||
69 | { | ||
70 | |||
71 | } | ||
72 | public void LoadPrimitives(ILocalStorageReceiver receiver) | ||
73 | { | ||
74 | |||
75 | } | ||
76 | public float[] LoadWorld() | ||
77 | { | ||
78 | return new float[65536]; | ||
79 | } | ||
80 | public void SaveMap(float[] heightmap) | ||
81 | { | ||
82 | |||
83 | } | ||
84 | |||
85 | public void SaveLandObjects(LandData[] land_data) | ||
86 | { | ||
87 | } | ||
88 | |||
89 | public void SaveLandObject(LandData land) | ||
90 | { | ||
91 | } | ||
92 | |||
93 | public void RemoveLandObject(LandData land) | ||
94 | { | ||
95 | } | ||
96 | |||
97 | public void RemoveAllLandObjects() | ||
98 | { | ||
99 | } | ||
100 | |||
101 | public void LoadLandObjects(ILocalStorageLandObjectReceiver recv) | ||
102 | { | ||
103 | recv.NoLandDataFromStorage(); | ||
104 | } | ||
105 | |||
106 | public void ShutDown() | ||
107 | { | ||
108 | sim.GetDb().Close(); | ||
109 | DB.Close(); | ||
110 | } | ||
111 | } | ||
112 | } \ No newline at end of file | ||
diff --git a/OpenSim/Region/Storage/LocalStorageDb4o/AssemblyInfo.cs b/OpenSim/Region/Storage/LocalStorageDb4o/AssemblyInfo.cs deleted file mode 100644 index a3aac18..0000000 --- a/OpenSim/Region/Storage/LocalStorageDb4o/AssemblyInfo.cs +++ /dev/null | |||
@@ -1,56 +0,0 @@ | |||
1 | /* | ||
2 | * Copyright (c) Contributors, http://www.openmetaverse.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 OpenSim 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.Reflection; | ||
29 | using System.Runtime.InteropServices; | ||
30 | // Information about this assembly is defined by the following | ||
31 | // attributes. | ||
32 | // | ||
33 | // change them to the information which is associated with the assembly | ||
34 | // you compile. | ||
35 | |||
36 | [assembly: AssemblyTitle("Db4LocalStorage")] | ||
37 | [assembly: AssemblyDescription("")] | ||
38 | [assembly: AssemblyConfiguration("")] | ||
39 | [assembly: AssemblyCompany("")] | ||
40 | [assembly: AssemblyProduct("Db4LocalStorage")] | ||
41 | [assembly: AssemblyCopyright("")] | ||
42 | [assembly: AssemblyTrademark("")] | ||
43 | [assembly: AssemblyCulture("")] | ||
44 | |||
45 | // This sets the default COM visibility of types in the assembly to invisible. | ||
46 | // If you need to expose a type to COM, use [ComVisible(true)] on that type. | ||
47 | [assembly: ComVisible(false)] | ||
48 | |||
49 | // The assembly version has following format : | ||
50 | // | ||
51 | // Major.Minor.Build.Revision | ||
52 | // | ||
53 | // You can specify all values by your own or you can build default build and revision | ||
54 | // numbers with the '*' character (the default): | ||
55 | |||
56 | [assembly: AssemblyVersion("1.0.*")] | ||
diff --git a/OpenSim/Region/Storage/LocalStorageDb4o/Db4LocalStorage.cs b/OpenSim/Region/Storage/LocalStorageDb4o/Db4LocalStorage.cs deleted file mode 100644 index 5dc5a3b..0000000 --- a/OpenSim/Region/Storage/LocalStorageDb4o/Db4LocalStorage.cs +++ /dev/null | |||
@@ -1,267 +0,0 @@ | |||
1 | /* | ||
2 | * Copyright (c) Contributors, http://www.openmetaverse.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 OpenSim 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 Db4objects.Db4o; | ||
30 | using libsecondlife; | ||
31 | using OpenSim.Framework.Console; | ||
32 | using OpenSim.Framework.Interfaces; | ||
33 | using OpenSim.Framework.Types; | ||
34 | |||
35 | namespace OpenSim.Region.Storage.LocalStorageDb4o | ||
36 | { | ||
37 | /// <summary> | ||
38 | /// | ||
39 | /// </summary> | ||
40 | public class Db4LocalStorage : ILocalStorage | ||
41 | { | ||
42 | private IObjectContainer db; | ||
43 | private string datastore; | ||
44 | |||
45 | public Db4LocalStorage() | ||
46 | { | ||
47 | |||
48 | } | ||
49 | |||
50 | public void Initialise(string dfile) | ||
51 | { | ||
52 | MainLog.Instance.Warn("Db4LocalStorage Opening " + dfile); | ||
53 | datastore = dfile; | ||
54 | try | ||
55 | { | ||
56 | db = Db4oFactory.OpenFile(datastore); | ||
57 | MainLog.Instance.Verbose("Db4LocalStorage creation"); | ||
58 | } | ||
59 | catch (Exception e) | ||
60 | { | ||
61 | db.Close(); | ||
62 | MainLog.Instance.Warn("Db4LocalStorage :Constructor - Exception occured"); | ||
63 | MainLog.Instance.Warn(e.ToString()); | ||
64 | } | ||
65 | } | ||
66 | |||
67 | public void StorePrim(PrimData prim) | ||
68 | { | ||
69 | IObjectSet result = db.Query(new UUIDPrimQuery(prim.FullID)); | ||
70 | if (result.Count > 0) | ||
71 | { | ||
72 | //prim already in storage | ||
73 | //so update it | ||
74 | PrimData found = (PrimData)result.Next(); | ||
75 | found.PathBegin = prim.PathBegin; | ||
76 | found.PathCurve = prim.PathCurve; | ||
77 | found.PathEnd = prim.PathEnd; | ||
78 | found.PathRadiusOffset = prim.PathRadiusOffset; | ||
79 | found.PathRevolutions = prim.PathRevolutions; | ||
80 | found.PathScaleX = prim.PathScaleX; | ||
81 | found.PathScaleY = prim.PathScaleY; | ||
82 | found.PathShearX = prim.PathShearX; | ||
83 | found.PathShearY = prim.PathShearY; | ||
84 | found.PathSkew = prim.PathSkew; | ||
85 | found.PathTaperX = prim.PathTaperX; | ||
86 | found.PathTaperY = prim.PathTaperY; | ||
87 | found.PathTwist = prim.PathTwist; | ||
88 | found.PathTwistBegin = prim.PathTwistBegin; | ||
89 | found.PCode = prim.PCode; | ||
90 | found.ProfileBegin = prim.ProfileBegin; | ||
91 | found.ProfileCurve = prim.ProfileCurve; | ||
92 | found.ProfileEnd = prim.ProfileEnd; | ||
93 | found.ProfileHollow = prim.ProfileHollow; | ||
94 | found.Position = prim.Position; | ||
95 | found.Rotation = prim.Rotation; | ||
96 | found.TextureEntry = prim.TextureEntry; | ||
97 | db.Set(found); | ||
98 | db.Commit(); | ||
99 | } | ||
100 | else | ||
101 | { | ||
102 | //not in storage | ||
103 | db.Set(prim); | ||
104 | db.Commit(); | ||
105 | } | ||
106 | } | ||
107 | |||
108 | public void RemovePrim(LLUUID primID) | ||
109 | { | ||
110 | IObjectSet result = db.Query(new UUIDPrimQuery(primID)); | ||
111 | if (result.Count > 0) | ||
112 | { | ||
113 | PrimData found = (PrimData)result.Next(); | ||
114 | db.Delete(found); | ||
115 | } | ||
116 | } | ||
117 | |||
118 | |||
119 | public void LoadPrimitives(ILocalStorageReceiver receiver) | ||
120 | { | ||
121 | IObjectSet result = db.Get(typeof(PrimData)); | ||
122 | MainLog.Instance.Verbose("Db4LocalStorage.cs: LoadPrimitives() - number of prims in storages is " + result.Count); | ||
123 | foreach (PrimData prim in result) | ||
124 | { | ||
125 | receiver.PrimFromStorage(prim); | ||
126 | } | ||
127 | } | ||
128 | |||
129 | public float[] LoadWorld() | ||
130 | { | ||
131 | MainLog.Instance.Verbose("LoadWorld() - Loading world...."); | ||
132 | float[] heightmap = null; | ||
133 | MainLog.Instance.Verbose("LoadWorld() - Looking for a heightmap in local DB"); | ||
134 | IObjectSet world_result = db.Get(typeof(MapStorage)); | ||
135 | if (world_result.Count > 0) | ||
136 | { | ||
137 | MainLog.Instance.Verbose("LoadWorld() - Found a heightmap in local database, loading"); | ||
138 | MapStorage map = (MapStorage)world_result.Next(); | ||
139 | //blank.LandMap = map.Map; | ||
140 | heightmap = map.Map; | ||
141 | } | ||
142 | return heightmap; | ||
143 | } | ||
144 | |||
145 | public void SaveMap(float[] heightmap) | ||
146 | { | ||
147 | IObjectSet world_result = db.Get(typeof(MapStorage)); | ||
148 | if (world_result.Count > 0) | ||
149 | { | ||
150 | MainLog.Instance.Verbose("SaveWorld() - updating saved copy of heightmap in local database"); | ||
151 | MapStorage map = (MapStorage)world_result.Next(); | ||
152 | db.Delete(map); | ||
153 | } | ||
154 | MapStorage map1 = new MapStorage(); | ||
155 | map1.Map = heightmap; //OpenSim_Main.local_world.LandMap; | ||
156 | db.Set(map1); | ||
157 | db.Commit(); | ||
158 | } | ||
159 | |||
160 | public void SaveLandObject(LandData landObject) | ||
161 | { | ||
162 | IObjectSet result = db.Query(new UUIDLandQuery(landObject.globalID)); | ||
163 | if (result.Count > 0) | ||
164 | { | ||
165 | //Old Land | ||
166 | LandData updateLand = (LandData)result.Next(); | ||
167 | updateLand.AABBMax = landObject.AABBMax; | ||
168 | updateLand.AABBMin = landObject.AABBMin; | ||
169 | updateLand.area = landObject.area; | ||
170 | updateLand.auctionID = landObject.auctionID; | ||
171 | updateLand.authBuyerID = landObject.authBuyerID; | ||
172 | updateLand.category = landObject.category; | ||
173 | updateLand.claimDate = landObject.claimDate; | ||
174 | updateLand.claimPrice = landObject.claimPrice; | ||
175 | updateLand.groupID = landObject.groupID; | ||
176 | updateLand.groupPrims = landObject.groupPrims; | ||
177 | updateLand.isGroupOwned = landObject.isGroupOwned; | ||
178 | updateLand.landingType = landObject.landingType; | ||
179 | updateLand.mediaAutoScale = landObject.mediaAutoScale; | ||
180 | updateLand.mediaID = landObject.mediaID; | ||
181 | updateLand.mediaURL = landObject.mediaURL; | ||
182 | updateLand.musicURL = landObject.musicURL; | ||
183 | updateLand.localID = landObject.localID; | ||
184 | updateLand.ownerID = landObject.ownerID; | ||
185 | updateLand.passHours = landObject.passHours; | ||
186 | updateLand.passPrice = landObject.passPrice; | ||
187 | updateLand.landBitmapByteArray = (byte[])landObject.landBitmapByteArray.Clone(); | ||
188 | updateLand.landDesc = landObject.landDesc; | ||
189 | updateLand.landFlags = landObject.landFlags; | ||
190 | updateLand.landName = landObject.landName; | ||
191 | updateLand.landStatus = landObject.landStatus; | ||
192 | updateLand.salePrice = landObject.salePrice; | ||
193 | updateLand.snapshotID = landObject.snapshotID; | ||
194 | updateLand.userLocation = landObject.userLocation; | ||
195 | updateLand.userLookAt = landObject.userLookAt; | ||
196 | |||
197 | db.Set(updateLand); | ||
198 | } | ||
199 | else | ||
200 | { | ||
201 | db.Set(landObject); | ||
202 | } | ||
203 | db.Commit(); | ||
204 | } | ||
205 | |||
206 | public void SaveLandObjects(LandData[] landObject_data) | ||
207 | { | ||
208 | MainLog.Instance.Notice("Land Backup: Saving Lands..."); | ||
209 | int i; | ||
210 | for (i = 0; i < landObject_data.GetLength(0); i++) | ||
211 | { | ||
212 | |||
213 | SaveLandObject(landObject_data[i]); | ||
214 | |||
215 | } | ||
216 | MainLog.Instance.Notice("Land Backup: Land Save Complete"); | ||
217 | } | ||
218 | |||
219 | public void RemoveLandObject(LandData landObject) | ||
220 | { | ||
221 | IObjectSet result = db.Query(new UUIDLandQuery(landObject.globalID)); | ||
222 | if (result.Count > 0) | ||
223 | { | ||
224 | db.Delete(result[0]); | ||
225 | } | ||
226 | db.Commit(); | ||
227 | } | ||
228 | public void RemoveAllLandObjects() | ||
229 | { | ||
230 | MainLog.Instance.Notice("Land Backup: Removing all land objects..."); | ||
231 | IObjectSet result = db.Get(typeof(LandData)); | ||
232 | if (result.Count > 0) | ||
233 | { | ||
234 | foreach (LandData landData in result) | ||
235 | { | ||
236 | RemoveLandObject(landData); | ||
237 | } | ||
238 | } | ||
239 | } | ||
240 | |||
241 | public void LoadLandObjects(ILocalStorageLandObjectReceiver recv) | ||
242 | { | ||
243 | MainLog.Instance.Notice("Land Backup: Loading Lands..."); | ||
244 | IObjectSet result = db.Get(typeof(LandData)); | ||
245 | if (result.Count > 0) | ||
246 | { | ||
247 | MainLog.Instance.Notice("Land Backup: Lands exist in database."); | ||
248 | foreach (LandData landData in result) | ||
249 | { | ||
250 | |||
251 | recv.LandFromStorage(landData); | ||
252 | } | ||
253 | } | ||
254 | else | ||
255 | { | ||
256 | MainLog.Instance.Notice("Land Backup: No landObjects exist. Creating basic landObject."); | ||
257 | recv.NoLandDataFromStorage(); | ||
258 | } | ||
259 | MainLog.Instance.Notice("Land Backup: Lands Restored"); | ||
260 | } | ||
261 | public void ShutDown() | ||
262 | { | ||
263 | db.Commit(); | ||
264 | db.Close(); | ||
265 | } | ||
266 | } | ||
267 | } \ No newline at end of file | ||
diff --git a/OpenSim/Region/Storage/LocalStorageDb4o/MapStorage.cs b/OpenSim/Region/Storage/LocalStorageDb4o/MapStorage.cs deleted file mode 100644 index 3a5dd19..0000000 --- a/OpenSim/Region/Storage/LocalStorageDb4o/MapStorage.cs +++ /dev/null | |||
@@ -1,39 +0,0 @@ | |||
1 | /* | ||
2 | * Copyright (c) Contributors, http://www.openmetaverse.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 OpenSim 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 | namespace OpenSim.Region.Storage.LocalStorageDb4o | ||
29 | { | ||
30 | public class MapStorage | ||
31 | { | ||
32 | public float[] Map; | ||
33 | |||
34 | public MapStorage() | ||
35 | { | ||
36 | |||
37 | } | ||
38 | } | ||
39 | } \ No newline at end of file | ||
diff --git a/OpenSim/Region/Storage/LocalStorageDb4o/UUIDLandQuery.cs b/OpenSim/Region/Storage/LocalStorageDb4o/UUIDLandQuery.cs deleted file mode 100644 index 6c5b2fb..0000000 --- a/OpenSim/Region/Storage/LocalStorageDb4o/UUIDLandQuery.cs +++ /dev/null | |||
@@ -1,47 +0,0 @@ | |||
1 | /* | ||
2 | * Copyright (c) Contributors, http://www.openmetaverse.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 OpenSim 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 Db4objects.Db4o.Query; | ||
29 | using libsecondlife; | ||
30 | using OpenSim.Framework.Types; | ||
31 | |||
32 | namespace OpenSim.Region.Storage.LocalStorageDb4o | ||
33 | { | ||
34 | public class UUIDLandQuery : Predicate | ||
35 | { | ||
36 | private LLUUID globalIDSearch; | ||
37 | |||
38 | public UUIDLandQuery(LLUUID find) | ||
39 | { | ||
40 | globalIDSearch = find; | ||
41 | } | ||
42 | public bool Match(LandData land) | ||
43 | { | ||
44 | return (land.globalID == globalIDSearch); | ||
45 | } | ||
46 | } | ||
47 | } | ||
diff --git a/OpenSim/Region/Storage/LocalStorageDb4o/UUIDPrimQuery.cs b/OpenSim/Region/Storage/LocalStorageDb4o/UUIDPrimQuery.cs deleted file mode 100644 index d5077ff..0000000 --- a/OpenSim/Region/Storage/LocalStorageDb4o/UUIDPrimQuery.cs +++ /dev/null | |||
@@ -1,47 +0,0 @@ | |||
1 | /* | ||
2 | * Copyright (c) Contributors, http://www.openmetaverse.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 OpenSim 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 Db4objects.Db4o.Query; | ||
29 | using libsecondlife; | ||
30 | using OpenSim.Framework.Types; | ||
31 | |||
32 | namespace OpenSim.Region.Storage.LocalStorageDb4o | ||
33 | { | ||
34 | public class UUIDPrimQuery : Predicate | ||
35 | { | ||
36 | private LLUUID _findID; | ||
37 | |||
38 | public UUIDPrimQuery(LLUUID find) | ||
39 | { | ||
40 | _findID = find; | ||
41 | } | ||
42 | public bool Match(PrimData prim) | ||
43 | { | ||
44 | return (prim.FullID == _findID); | ||
45 | } | ||
46 | } | ||
47 | } | ||
diff --git a/OpenSim/Region/Storage/LocalStorageSQLite/Properties/AssemblyInfo.cs b/OpenSim/Region/Storage/LocalStorageSQLite/Properties/AssemblyInfo.cs deleted file mode 100644 index 6bbaf0f..0000000 --- a/OpenSim/Region/Storage/LocalStorageSQLite/Properties/AssemblyInfo.cs +++ /dev/null | |||
@@ -1,60 +0,0 @@ | |||
1 | /* | ||
2 | * Copyright (c) Contributors, http://www.openmetaverse.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 OpenSim 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.Reflection; | ||
29 | using System.Runtime.InteropServices; | ||
30 | // General Information about an assembly is controlled through the following | ||
31 | // set of attributes. Change these attribute values to modify the information | ||
32 | // associated with an assembly. | ||
33 | [assembly: AssemblyTitle("OpenSim.Region.Storage.LocalStorageSQLite")] | ||
34 | [assembly: AssemblyDescription("")] | ||
35 | [assembly: AssemblyConfiguration("")] | ||
36 | [assembly: AssemblyCompany("")] | ||
37 | [assembly: AssemblyProduct("OpenSim.Region.Storage.LocalStorageSQLite")] | ||
38 | [assembly: AssemblyCopyright("Copyright © 2007")] | ||
39 | [assembly: AssemblyTrademark("")] | ||
40 | [assembly: AssemblyCulture("")] | ||
41 | |||
42 | // Setting ComVisible to false makes the types in this assembly not visible | ||
43 | // to COM components. If you need to access a type in this assembly from | ||
44 | // COM, set the ComVisible attribute to true on that type. | ||
45 | [assembly: ComVisible(false)] | ||
46 | |||
47 | // The following GUID is for the ID of the typelib if this project is exposed to COM | ||
48 | [assembly: Guid("ecd6e0c1-7909-413e-9e3f-659678ac3bc3")] | ||
49 | |||
50 | // Version information for an assembly consists of the following four values: | ||
51 | // | ||
52 | // Major Version | ||
53 | // Minor Version | ||
54 | // Build Number | ||
55 | // Revision | ||
56 | // | ||
57 | // You can specify all the values or you can default the Revision and Build Numbers | ||
58 | // by using the '*' as shown below: | ||
59 | [assembly: AssemblyVersion("1.0.0.0")] | ||
60 | [assembly: AssemblyFileVersion("1.0.0.0")] | ||
diff --git a/OpenSim/Region/Storage/LocalStorageSQLite/SQLiteLocalStorage.cs b/OpenSim/Region/Storage/LocalStorageSQLite/SQLiteLocalStorage.cs deleted file mode 100644 index 88c5bde..0000000 --- a/OpenSim/Region/Storage/LocalStorageSQLite/SQLiteLocalStorage.cs +++ /dev/null | |||
@@ -1,198 +0,0 @@ | |||
1 | /* | ||
2 | * Copyright (c) Contributors, http://www.openmetaverse.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 OpenSim 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 | |||
29 | // SQLite Support | ||
30 | // A bad idea, but the IRC people told me to! | ||
31 | |||
32 | using System; | ||
33 | using System.Data; | ||
34 | using System.Data.SQLite; | ||
35 | using libsecondlife; | ||
36 | using OpenSim.Framework.Console; | ||
37 | using OpenSim.Framework.Interfaces; | ||
38 | using OpenSim.Framework.Types; | ||
39 | |||
40 | namespace OpenSim.Region.Storage.LocalStorageSQLite | ||
41 | { | ||
42 | public class SQLiteLocalStorage : ILocalStorage | ||
43 | { | ||
44 | IDbConnection db; | ||
45 | |||
46 | public SQLiteLocalStorage() | ||
47 | { | ||
48 | try | ||
49 | { | ||
50 | string connectionstring = "URI=file:localsim.sdb"; | ||
51 | db = (IDbConnection)new SQLiteConnection(connectionstring); | ||
52 | db.Open(); | ||
53 | } | ||
54 | catch (Exception e) | ||
55 | { | ||
56 | db.Close(); | ||
57 | MainLog.Instance.Warn("SQLiteLocalStorage :Constructor - Exception occured"); | ||
58 | MainLog.Instance.Warn(e.ToString()); | ||
59 | } | ||
60 | } | ||
61 | |||
62 | public void Initialise(string file) | ||
63 | { | ||
64 | // Blank | ||
65 | } | ||
66 | |||
67 | public void StorePrim(PrimData prim) | ||
68 | { | ||
69 | IDbCommand cmd = db.CreateCommand(); | ||
70 | |||
71 | //SECURITY WARNING: | ||
72 | // These parameters wont produce SQL injections since they are all integer based, however. | ||
73 | // if inserting strings such as name or description, you will need to use appropriate | ||
74 | // measures to prevent SQL injection (although the value of SQL injection in this is limited). | ||
75 | |||
76 | string sql = "REPLACE INTO prim (OwnerID,PCode,PathBegin,PathEnd,PathScaleX,PathScaleY,PathShearX,PathShearY,PathSkew,ProfileBegin,ProfileEnd,Scale,PathCurve,ProfileCurve,ParentID,ProfileHollow,PathRadiusOffset,PathRevolutions,PathTaperX,PathTaperY,PathTwist,PathTwistBegin,Texture,CreationDate,OwnerMask,NextOwnerMask,GroupMask,EveryoneMask,BaseMask,Position,Rotation,LocalID,FullID) "; | ||
77 | sql += "VALUES ("; | ||
78 | sql += "\"" + prim.OwnerID.ToStringHyphenated() + "\","; // KILL ME NOW! | ||
79 | sql += "\"" + prim.PCode.ToString() + "\","; | ||
80 | sql += "\"" + prim.PathBegin.ToString() + "\","; | ||
81 | sql += "\"" + prim.PathEnd.ToString() + "\","; | ||
82 | sql += "\"" + prim.PathScaleX.ToString() + "\","; | ||
83 | sql += "\"" + prim.PathScaleY.ToString() + "\","; | ||
84 | sql += "\"" + prim.PathShearX.ToString() + "\","; | ||
85 | sql += "\"" + prim.PathShearY.ToString() + "\","; | ||
86 | sql += "\"" + prim.PathSkew.ToString() + "\","; | ||
87 | sql += "\"" + prim.ProfileBegin.ToString() + "\","; | ||
88 | sql += "\"" + prim.ProfileEnd.ToString() + "\","; | ||
89 | sql += "\"" + prim.Scale.ToString() + "\","; | ||
90 | sql += "\"" + prim.PathCurve.ToString() + "\","; | ||
91 | sql += "\"" + prim.ProfileCurve.ToString() + "\","; | ||
92 | sql += "\"" + prim.ParentID.ToString() + "\","; | ||
93 | sql += "\"" + prim.ProfileHollow.ToString() + "\","; | ||
94 | sql += "\"" + prim.PathRadiusOffset.ToString() + "\","; | ||
95 | sql += "\"" + prim.PathRevolutions.ToString() + "\","; | ||
96 | sql += "\"" + prim.PathTaperX.ToString() + "\","; | ||
97 | sql += "\"" + prim.PathTaperY.ToString() + "\","; | ||
98 | sql += "\"" + prim.PathTwist.ToString() + "\","; | ||
99 | sql += "\"" + prim.PathTwistBegin.ToString() + "\","; | ||
100 | sql += "\"" + prim.TextureEntry.ToString() + "\","; | ||
101 | sql += "\"" + prim.CreationDate.ToString() + "\","; | ||
102 | sql += "\"" + prim.OwnerMask.ToString() + "\","; | ||
103 | sql += "\"" + prim.NextOwnerMask.ToString() + "\","; | ||
104 | sql += "\"" + prim.GroupMask.ToString() + "\","; | ||
105 | sql += "\"" + prim.EveryoneMask.ToString() + "\","; | ||
106 | sql += "\"" + prim.BaseMask.ToString() + "\","; | ||
107 | sql += "\"" + prim.Position.ToString() + "\","; | ||
108 | sql += "\"" + prim.Rotation.ToString() + "\","; | ||
109 | sql += "\"" + prim.LocalID.ToString() + "\","; | ||
110 | sql += "\"" + prim.FullID.ToString() + "\")"; | ||
111 | |||
112 | cmd.CommandText = sql; | ||
113 | |||
114 | try | ||
115 | { | ||
116 | cmd.ExecuteNonQuery(); | ||
117 | } | ||
118 | catch (Exception e) | ||
119 | { | ||
120 | MainLog.Instance.Warn("SQLiteLocalStorage :StorePrim - Exception occured"); | ||
121 | MainLog.Instance.Warn(e.ToString()); | ||
122 | } | ||
123 | |||
124 | cmd.Dispose(); | ||
125 | cmd = null; | ||
126 | } | ||
127 | |||
128 | public void RemovePrim(LLUUID primID) | ||
129 | { | ||
130 | IDbCommand cmd = db.CreateCommand(); | ||
131 | |||
132 | //SECURITY WARNING: | ||
133 | // These parameters wont produce SQL injections since they are all integer based, however. | ||
134 | // if inserting strings such as name or description, you will need to use appropriate | ||
135 | // measures to prevent SQL injection (although the value of SQL injection in this is limited). | ||
136 | |||
137 | string sql = "DELETE FROM prim WHERE FullID = \"" + primID.ToStringHyphenated() + "\""; | ||
138 | |||
139 | cmd.CommandText = sql; | ||
140 | |||
141 | try | ||
142 | { | ||
143 | cmd.ExecuteNonQuery(); | ||
144 | } | ||
145 | catch (Exception e) | ||
146 | { | ||
147 | MainLog.Instance.Warn("SQLiteLocalStorage :RemovePrim - Exception occured"); | ||
148 | MainLog.Instance.Warn(e.ToString()); | ||
149 | } | ||
150 | |||
151 | cmd.Dispose(); | ||
152 | cmd = null; | ||
153 | } | ||
154 | |||
155 | public void LoadPrimitives(ILocalStorageReceiver receiver) | ||
156 | { | ||
157 | |||
158 | } | ||
159 | |||
160 | public float[] LoadWorld() | ||
161 | { | ||
162 | return new float[65536]; | ||
163 | } | ||
164 | |||
165 | public void SaveMap(float[] heightmap) | ||
166 | { | ||
167 | |||
168 | } | ||
169 | |||
170 | public void SaveLandObjects(LandData[] land_manager) | ||
171 | { | ||
172 | |||
173 | } | ||
174 | |||
175 | public void SaveLandObject(LandData land) | ||
176 | { | ||
177 | } | ||
178 | |||
179 | public void RemoveLandObject(LandData land) | ||
180 | { | ||
181 | } | ||
182 | |||
183 | public void RemoveAllLandObjects() | ||
184 | { | ||
185 | } | ||
186 | |||
187 | public void LoadLandObjects(ILocalStorageLandObjectReceiver recv) | ||
188 | { | ||
189 | recv.NoLandDataFromStorage(); | ||
190 | } | ||
191 | |||
192 | public void ShutDown() | ||
193 | { | ||
194 | db.Close(); | ||
195 | db = null; | ||
196 | } | ||
197 | } | ||
198 | } \ No newline at end of file | ||