aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Data/MySQL
diff options
context:
space:
mode:
authorlbsa712009-04-13 20:04:18 +0000
committerlbsa712009-04-13 20:04:18 +0000
commit29355de6ee01b1f44f32ea45b9c06f636ae9a241 (patch)
tree677fb0c71117a6feaa5891f5c7ceacdd8d2069a6 /OpenSim/Data/MySQL
parent* Remove null reference exception in the J2KDecoderModule's J2K repair routin... (diff)
downloadopensim-SC_OLD-29355de6ee01b1f44f32ea45b9c06f636ae9a241.zip
opensim-SC_OLD-29355de6ee01b1f44f32ea45b9c06f636ae9a241.tar.gz
opensim-SC_OLD-29355de6ee01b1f44f32ea45b9c06f636ae9a241.tar.bz2
opensim-SC_OLD-29355de6ee01b1f44f32ea45b9c06f636ae9a241.tar.xz
* Some more experimental work on distributed assets. Nothing hotwired yet.
* Introduced preprocess step in FetchAsset (Might revert this later) * Some minor CCC * Added actual implementation of GetUserProfile( uri ) and the corresponding handler to OGS1. * Introduced non-functioning GetUserUri( userProfile) awaiting user server wireup (this might move elsewhere)
Diffstat (limited to 'OpenSim/Data/MySQL')
-rw-r--r--OpenSim/Data/MySQL/MySQLAssetData.cs36
1 files changed, 19 insertions, 17 deletions
diff --git a/OpenSim/Data/MySQL/MySQLAssetData.cs b/OpenSim/Data/MySQL/MySQLAssetData.cs
index 20b2673..cc16389 100644
--- a/OpenSim/Data/MySQL/MySQLAssetData.cs
+++ b/OpenSim/Data/MySQL/MySQLAssetData.cs
@@ -109,6 +109,24 @@ namespace OpenSim.Data.MySQL
109 109
110 public override void Dispose() { } 110 public override void Dispose() { }
111 111
112 /// <summary>
113 /// Database provider version
114 /// </summary>
115 override public string Version
116 {
117 get { return _dbConnection.getVersion(); }
118 }
119
120 /// <summary>
121 /// The name of this DB provider
122 /// </summary>
123 override public string Name
124 {
125 get { return "MySQL Asset storage engine"; }
126 }
127
128 #endregion
129
112 #region IAssetDataPlugin Members 130 #region IAssetDataPlugin Members
113 131
114 /// <summary> 132 /// <summary>
@@ -117,7 +135,7 @@ namespace OpenSim.Data.MySQL
117 /// <param name="assetID">Asset UUID to fetch</param> 135 /// <param name="assetID">Asset UUID to fetch</param>
118 /// <returns>Return the asset</returns> 136 /// <returns>Return the asset</returns>
119 /// <remarks>On failure : throw an exception and attempt to reconnect to database</remarks> 137 /// <remarks>On failure : throw an exception and attempt to reconnect to database</remarks>
120 override public AssetBase FetchAsset(UUID assetID) 138 override protected AssetBase FetchStoredAsset(UUID assetID)
121 { 139 {
122 AssetBase asset = null; 140 AssetBase asset = null;
123 lock (_dbConnection) 141 lock (_dbConnection)
@@ -364,22 +382,6 @@ namespace OpenSim.Data.MySQL
364 382
365 #endregion 383 #endregion
366 384
367 /// <summary>
368 /// Database provider version
369 /// </summary>
370 override public string Version
371 {
372 get { return _dbConnection.getVersion(); }
373 }
374 385
375 /// <summary>
376 /// The name of this DB provider
377 /// </summary>
378 override public string Name
379 {
380 get { return "MySQL Asset storage engine"; }
381 }
382
383 #endregion
384 } 386 }
385} 387}