diff options
Merge branch 'master' of ssh://opensimulator.org/var/git/opensim
Conflicts:
OpenSim/Framework/Util.cs
Diffstat (limited to 'OpenSim/Data/MySQL/MySQLXAssetData.cs')
-rw-r--r-- | OpenSim/Data/MySQL/MySQLXAssetData.cs | 22 |
1 files changed, 11 insertions, 11 deletions
diff --git a/OpenSim/Data/MySQL/MySQLXAssetData.cs b/OpenSim/Data/MySQL/MySQLXAssetData.cs index 06fe55a..e6ac22e 100644 --- a/OpenSim/Data/MySQL/MySQLXAssetData.cs +++ b/OpenSim/Data/MySQL/MySQLXAssetData.cs | |||
@@ -41,7 +41,7 @@ using OpenSim.Data; | |||
41 | 41 | ||
42 | namespace OpenSim.Data.MySQL | 42 | namespace OpenSim.Data.MySQL |
43 | { | 43 | { |
44 | public class MySQLXAssetData : AssetDataBase | 44 | public class MySQLXAssetData : IXAssetDataPlugin |
45 | { | 45 | { |
46 | private static readonly ILog m_log = LogManager.GetLogger(MethodBase.GetCurrentMethod().DeclaringType); | 46 | private static readonly ILog m_log = LogManager.GetLogger(MethodBase.GetCurrentMethod().DeclaringType); |
47 | 47 | ||
@@ -61,7 +61,7 @@ namespace OpenSim.Data.MySQL | |||
61 | 61 | ||
62 | #region IPlugin Members | 62 | #region IPlugin Members |
63 | 63 | ||
64 | public override string Version { get { return "1.0.0.0"; } } | 64 | public string Version { get { return "1.0.0.0"; } } |
65 | 65 | ||
66 | /// <summary> | 66 | /// <summary> |
67 | /// <para>Initialises Asset interface</para> | 67 | /// <para>Initialises Asset interface</para> |
@@ -74,7 +74,7 @@ namespace OpenSim.Data.MySQL | |||
74 | /// </para> | 74 | /// </para> |
75 | /// </summary> | 75 | /// </summary> |
76 | /// <param name="connect">connect string</param> | 76 | /// <param name="connect">connect string</param> |
77 | public override void Initialise(string connect) | 77 | public void Initialise(string connect) |
78 | { | 78 | { |
79 | m_log.ErrorFormat("[MYSQL XASSETDATA]: ***********************************************************"); | 79 | m_log.ErrorFormat("[MYSQL XASSETDATA]: ***********************************************************"); |
80 | m_log.ErrorFormat("[MYSQL XASSETDATA]: ***********************************************************"); | 80 | m_log.ErrorFormat("[MYSQL XASSETDATA]: ***********************************************************"); |
@@ -96,17 +96,17 @@ namespace OpenSim.Data.MySQL | |||
96 | } | 96 | } |
97 | } | 97 | } |
98 | 98 | ||
99 | public override void Initialise() | 99 | public void Initialise() |
100 | { | 100 | { |
101 | throw new NotImplementedException(); | 101 | throw new NotImplementedException(); |
102 | } | 102 | } |
103 | 103 | ||
104 | public override void Dispose() { } | 104 | public void Dispose() { } |
105 | 105 | ||
106 | /// <summary> | 106 | /// <summary> |
107 | /// The name of this DB provider | 107 | /// The name of this DB provider |
108 | /// </summary> | 108 | /// </summary> |
109 | override public string Name | 109 | public string Name |
110 | { | 110 | { |
111 | get { return "MySQL XAsset storage engine"; } | 111 | get { return "MySQL XAsset storage engine"; } |
112 | } | 112 | } |
@@ -121,7 +121,7 @@ namespace OpenSim.Data.MySQL | |||
121 | /// <param name="assetID">Asset UUID to fetch</param> | 121 | /// <param name="assetID">Asset UUID to fetch</param> |
122 | /// <returns>Return the asset</returns> | 122 | /// <returns>Return the asset</returns> |
123 | /// <remarks>On failure : throw an exception and attempt to reconnect to database</remarks> | 123 | /// <remarks>On failure : throw an exception and attempt to reconnect to database</remarks> |
124 | override public AssetBase GetAsset(UUID assetID) | 124 | public AssetBase GetAsset(UUID assetID) |
125 | { | 125 | { |
126 | // m_log.DebugFormat("[MYSQL XASSET DATA]: Looking for asset {0}", assetID); | 126 | // m_log.DebugFormat("[MYSQL XASSET DATA]: Looking for asset {0}", assetID); |
127 | 127 | ||
@@ -190,7 +190,7 @@ namespace OpenSim.Data.MySQL | |||
190 | /// </summary> | 190 | /// </summary> |
191 | /// <param name="asset">Asset UUID to create</param> | 191 | /// <param name="asset">Asset UUID to create</param> |
192 | /// <remarks>On failure : Throw an exception and attempt to reconnect to database</remarks> | 192 | /// <remarks>On failure : Throw an exception and attempt to reconnect to database</remarks> |
193 | override public void StoreAsset(AssetBase asset) | 193 | public void StoreAsset(AssetBase asset) |
194 | { | 194 | { |
195 | lock (m_dbLock) | 195 | lock (m_dbLock) |
196 | { | 196 | { |
@@ -380,7 +380,7 @@ namespace OpenSim.Data.MySQL | |||
380 | /// </summary> | 380 | /// </summary> |
381 | /// <param name="uuid">The asset UUID</param> | 381 | /// <param name="uuid">The asset UUID</param> |
382 | /// <returns>true if it exists, false otherwise.</returns> | 382 | /// <returns>true if it exists, false otherwise.</returns> |
383 | override public bool ExistsAsset(UUID uuid) | 383 | public bool ExistsAsset(UUID uuid) |
384 | { | 384 | { |
385 | // m_log.DebugFormat("[ASSETS DB]: Checking for asset {0}", uuid); | 385 | // m_log.DebugFormat("[ASSETS DB]: Checking for asset {0}", uuid); |
386 | 386 | ||
@@ -426,7 +426,7 @@ namespace OpenSim.Data.MySQL | |||
426 | /// <param name="start">The number of results to discard from the total data set.</param> | 426 | /// <param name="start">The number of results to discard from the total data set.</param> |
427 | /// <param name="count">The number of rows the returned list should contain.</param> | 427 | /// <param name="count">The number of rows the returned list should contain.</param> |
428 | /// <returns>A list of AssetMetadata objects.</returns> | 428 | /// <returns>A list of AssetMetadata objects.</returns> |
429 | public override List<AssetMetadata> FetchAssetMetadataSet(int start, int count) | 429 | public List<AssetMetadata> FetchAssetMetadataSet(int start, int count) |
430 | { | 430 | { |
431 | List<AssetMetadata> retList = new List<AssetMetadata>(count); | 431 | List<AssetMetadata> retList = new List<AssetMetadata>(count); |
432 | 432 | ||
@@ -471,7 +471,7 @@ namespace OpenSim.Data.MySQL | |||
471 | return retList; | 471 | return retList; |
472 | } | 472 | } |
473 | 473 | ||
474 | public override bool Delete(string id) | 474 | public bool Delete(string id) |
475 | { | 475 | { |
476 | // m_log.DebugFormat("[XASSETS DB]: Deleting asset {0}", id); | 476 | // m_log.DebugFormat("[XASSETS DB]: Deleting asset {0}", id); |
477 | 477 | ||