OpenSim
/
OpenSimMirror
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

* Some asset loading refactoring

afrisby
lbsa71 2007-10-17 10:58:19 +00:00
parent 44a7db0e44
commit 26b8018bcc
2 changed files with 17 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
OpenSim/Framework/Communications/Cache/SQLAssetServer.cs
View File

@ -61,6 +61,11 @@ namespace OpenSim.Framework.Communications.Caches
} }
public SQLAssetServer( IAssetProvider assetProvider )
{
m_assetProviderPlugin = assetProvider;
}
public void AddPlugin(string FileName) public void AddPlugin(string FileName)
{ {
MainLog.Instance.Verbose("SQLAssetServer", "AssetStorage: Attempting to load " + FileName); MainLog.Instance.Verbose("SQLAssetServer", "AssetStorage: Attempting to load " + FileName);

21
OpenSim/Framework/Data.SQLite/SQLiteAssetData.cs
View File

@ -101,15 +101,8 @@ namespace OpenSim.Framework.Data.SQLite
public void UpdateAsset(AssetBase asset) public void UpdateAsset(AssetBase asset)
{ {
MainLog.Instance.Verbose("AssetStorage", LogAssetLoad(asset);
"Asset: " + asset.FullID +
", Name: " + asset.Name +
", Description: " + asset.Description +
", Type: " + asset.Type +
", InvType: " + asset.InvType +
", Temporary: " + asset.Temporary +
", Local: " + asset.Local +
", Data Length: " + asset.Data.Length );
DataTable assets = ds.Tables["assets"]; DataTable assets = ds.Tables["assets"];
lock(ds) { lock(ds) {
DataRow row = assets.Rows.Find(asset.FullID); DataRow row = assets.Rows.Find(asset.FullID);
@ -126,6 +119,16 @@ namespace OpenSim.Framework.Data.SQLite
} }
} }
private void LogAssetLoad(AssetBase asset)
{
string temporary = asset.Temporary ? "Temporary" : "Stored";
string local = asset.Local ? "Local" : "Remote";
MainLog.Instance.Verbose("ASSETSTORAGE",
string.Format("Loaded {6} {5} Asset: [{0}][{3}/{4}] \"{1}\":{2} ({7} bytes)",
asset.FullID, asset.Name, asset.Description, asset.Type, asset.InvType, temporary, local, asset.Data.Length) );
}
public bool ExistsAsset(LLUUID uuid) public bool ExistsAsset(LLUUID uuid)
{ {
DataRow row = ds.Tables["assets"].Rows.Find(uuid); DataRow row = ds.Tables["assets"].Rows.Find(uuid);