diff options
author | Teravus Ovares | 2008-09-06 07:52:41 +0000 |
---|---|---|
committer | Teravus Ovares | 2008-09-06 07:52:41 +0000 |
commit | 7d89e122930be39e84a6d174548fa2d12ac0484a (patch) | |
tree | e5aa5752f988a9aba2a969f49e5e208985eda80c /OpenSim/Data/SQLite/SQLiteAssetData.cs | |
parent | * minor: speculatively try a change to bamboo.build to see if this generates ... (diff) | |
download | opensim-SC-7d89e122930be39e84a6d174548fa2d12ac0484a.zip opensim-SC-7d89e122930be39e84a6d174548fa2d12ac0484a.tar.gz opensim-SC-7d89e122930be39e84a6d174548fa2d12ac0484a.tar.bz2 opensim-SC-7d89e122930be39e84a6d174548fa2d12ac0484a.tar.xz |
* This is the fabled LibOMV update with all of the libOMV types from JHurliman
* This is a HUGE OMG update and will definitely have unknown side effects.. so this is really only for the strong hearted at this point. Regular people should let the dust settle.
* This has been tested to work with most basic functions. However.. make sure you back up 'everything' before using this. It's that big!
* Essentially we're back at square 1 in the testing phase.. so lets identify things that broke.
Diffstat (limited to '')
-rw-r--r-- | OpenSim/Data/SQLite/SQLiteAssetData.cs | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/OpenSim/Data/SQLite/SQLiteAssetData.cs b/OpenSim/Data/SQLite/SQLiteAssetData.cs index 220cebf..8b14f09 100644 --- a/OpenSim/Data/SQLite/SQLiteAssetData.cs +++ b/OpenSim/Data/SQLite/SQLiteAssetData.cs | |||
@@ -28,7 +28,7 @@ | |||
28 | using System; | 28 | using System; |
29 | using System.Data; | 29 | using System.Data; |
30 | using System.Reflection; | 30 | using System.Reflection; |
31 | using libsecondlife; | 31 | using OpenMetaverse; |
32 | using log4net; | 32 | using log4net; |
33 | using Mono.Data.SqliteClient; | 33 | using Mono.Data.SqliteClient; |
34 | using OpenSim.Framework; | 34 | using OpenSim.Framework; |
@@ -87,7 +87,7 @@ namespace OpenSim.Data.SQLite | |||
87 | /// </summary> | 87 | /// </summary> |
88 | /// <param name="uuid">UUID of ... ?</param> | 88 | /// <param name="uuid">UUID of ... ?</param> |
89 | /// <returns>Asset base</returns> | 89 | /// <returns>Asset base</returns> |
90 | override public AssetBase FetchAsset(LLUUID uuid) | 90 | override public AssetBase FetchAsset(UUID uuid) |
91 | { | 91 | { |
92 | lock (this) | 92 | lock (this) |
93 | { | 93 | { |
@@ -190,7 +190,7 @@ namespace OpenSim.Data.SQLite | |||
190 | /// </summary> | 190 | /// </summary> |
191 | /// <param name="uuid">The asset UUID</param> | 191 | /// <param name="uuid">The asset UUID</param> |
192 | /// <returns>True if exist, or false.</returns> | 192 | /// <returns>True if exist, or false.</returns> |
193 | override public bool ExistsAsset(LLUUID uuid) | 193 | override public bool ExistsAsset(UUID uuid) |
194 | { | 194 | { |
195 | lock (this) { | 195 | lock (this) { |
196 | using (SqliteCommand cmd = new SqliteCommand(SelectAssetSQL, m_conn)) | 196 | using (SqliteCommand cmd = new SqliteCommand(SelectAssetSQL, m_conn)) |
@@ -217,7 +217,7 @@ namespace OpenSim.Data.SQLite | |||
217 | /// Delete an asset from database | 217 | /// Delete an asset from database |
218 | /// </summary> | 218 | /// </summary> |
219 | /// <param name="uuid"></param> | 219 | /// <param name="uuid"></param> |
220 | public void DeleteAsset(LLUUID uuid) | 220 | public void DeleteAsset(UUID uuid) |
221 | { | 221 | { |
222 | using (SqliteCommand cmd = new SqliteCommand(DeleteAssetSQL, m_conn)) | 222 | using (SqliteCommand cmd = new SqliteCommand(DeleteAssetSQL, m_conn)) |
223 | { | 223 | { |
@@ -239,7 +239,7 @@ namespace OpenSim.Data.SQLite | |||
239 | // back out. Not enough time to figure it out yet. | 239 | // back out. Not enough time to figure it out yet. |
240 | AssetBase asset = new AssetBase(); | 240 | AssetBase asset = new AssetBase(); |
241 | 241 | ||
242 | asset.FullID = new LLUUID((String) row["UUID"]); | 242 | asset.FullID = new UUID((String) row["UUID"]); |
243 | asset.Name = (String) row["Name"]; | 243 | asset.Name = (String) row["Name"]; |
244 | asset.Description = (String) row["Description"]; | 244 | asset.Description = (String) row["Description"]; |
245 | asset.Type = Convert.ToSByte(row["Type"]); | 245 | asset.Type = Convert.ToSByte(row["Type"]); |