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/MySQL/MySQLAssetData.cs | |
parent | * minor: speculatively try a change to bamboo.build to see if this generates ... (diff) | |
download | opensim-SC_OLD-7d89e122930be39e84a6d174548fa2d12ac0484a.zip opensim-SC_OLD-7d89e122930be39e84a6d174548fa2d12ac0484a.tar.gz opensim-SC_OLD-7d89e122930be39e84a6d174548fa2d12ac0484a.tar.bz2 opensim-SC_OLD-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 'OpenSim/Data/MySQL/MySQLAssetData.cs')
-rw-r--r-- | OpenSim/Data/MySQL/MySQLAssetData.cs | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/OpenSim/Data/MySQL/MySQLAssetData.cs b/OpenSim/Data/MySQL/MySQLAssetData.cs index 08a8c6e..5c58a4b 100644 --- a/OpenSim/Data/MySQL/MySQLAssetData.cs +++ b/OpenSim/Data/MySQL/MySQLAssetData.cs | |||
@@ -29,7 +29,7 @@ using System; | |||
29 | using System.Collections.Generic; | 29 | using System.Collections.Generic; |
30 | using System.Data; | 30 | using System.Data; |
31 | using System.Reflection; | 31 | using System.Reflection; |
32 | using libsecondlife; | 32 | using OpenMetaverse; |
33 | using log4net; | 33 | using log4net; |
34 | using MySql.Data.MySqlClient; | 34 | using MySql.Data.MySqlClient; |
35 | using OpenSim.Framework; | 35 | using OpenSim.Framework; |
@@ -116,7 +116,7 @@ namespace OpenSim.Data.MySQL | |||
116 | /// <param name="assetID">Asset UUID to fetch</param> | 116 | /// <param name="assetID">Asset UUID to fetch</param> |
117 | /// <returns>Return the asset</returns> | 117 | /// <returns>Return the asset</returns> |
118 | /// <remarks>On failure : throw an exception and attempt to reconnect to database</remarks> | 118 | /// <remarks>On failure : throw an exception and attempt to reconnect to database</remarks> |
119 | override public AssetBase FetchAsset(LLUUID assetID) | 119 | override public AssetBase FetchAsset(UUID assetID) |
120 | { | 120 | { |
121 | AssetBase asset = null; | 121 | AssetBase asset = null; |
122 | lock (_dbConnection) | 122 | lock (_dbConnection) |
@@ -223,7 +223,7 @@ namespace OpenSim.Data.MySQL | |||
223 | /// </summary> | 223 | /// </summary> |
224 | /// <param name="uuid">The asset UUID</param> | 224 | /// <param name="uuid">The asset UUID</param> |
225 | /// <returns>true if exist.</returns> | 225 | /// <returns>true if exist.</returns> |
226 | override public bool ExistsAsset(LLUUID uuid) | 226 | override public bool ExistsAsset(UUID uuid) |
227 | { | 227 | { |
228 | bool assetExists = false; | 228 | bool assetExists = false; |
229 | 229 | ||