From 9053e8510c5e829c4e641cc51bab9387894b5e3b Mon Sep 17 00:00:00 2001 From: Jeff Ames Date: Wed, 3 Sep 2008 14:05:49 +0000 Subject: [PATCH] Update svn properties. --- OpenSim/Data/MySQL/MySQLSuperManager.cs | 48 ++++---- .../Communications/Cache/FileAssetClient.cs | 112 +++++++++--------- 2 files changed, 80 insertions(+), 80 deletions(-) diff --git a/OpenSim/Data/MySQL/MySQLSuperManager.cs b/OpenSim/Data/MySQL/MySQLSuperManager.cs index 4a9c7fa82b..b2485b1c68 100644 --- a/OpenSim/Data/MySQL/MySQLSuperManager.cs +++ b/OpenSim/Data/MySQL/MySQLSuperManager.cs @@ -1,24 +1,24 @@ -using System.Threading; - -namespace OpenSim.Data.MySQL -{ - public class MySQLSuperManager - { - public bool Locked; - private readonly Mutex m_lock = new Mutex(false); - public MySQLManager Manager; - - public void GetLock() - { - Locked = true; - m_lock.WaitOne(); - } - - public void Release() - { - m_lock.ReleaseMutex(); - Locked = false; - } - - } -} +using System.Threading; + +namespace OpenSim.Data.MySQL +{ + public class MySQLSuperManager + { + public bool Locked; + private readonly Mutex m_lock = new Mutex(false); + public MySQLManager Manager; + + public void GetLock() + { + Locked = true; + m_lock.WaitOne(); + } + + public void Release() + { + m_lock.ReleaseMutex(); + Locked = false; + } + + } +} diff --git a/OpenSim/Framework/Communications/Cache/FileAssetClient.cs b/OpenSim/Framework/Communications/Cache/FileAssetClient.cs index fcab349ceb..3c74d4dd6b 100644 --- a/OpenSim/Framework/Communications/Cache/FileAssetClient.cs +++ b/OpenSim/Framework/Communications/Cache/FileAssetClient.cs @@ -1,56 +1,56 @@ -using System.IO; -using System.Xml.Serialization; - -namespace OpenSim.Framework.Communications.Cache -{ - public class FileAssetClient : AssetServerBase - { - private readonly string m_dir; - private readonly XmlSerializer m_xs = new XmlSerializer(typeof(AssetBase)); - - public FileAssetClient(string dir) - { - if(!Directory.Exists(dir)) - { - Directory.CreateDirectory(dir); - } - m_dir = dir; - } - public override void StoreAsset(AssetBase asset) - { - string cdir = m_dir + Path.DirectorySeparatorChar + asset.FullID.Data[0] - + Path.DirectorySeparatorChar + asset.FullID.Data[1]; - - if (!Directory.Exists(m_dir + Path.DirectorySeparatorChar + asset.FullID.Data[0])) - Directory.CreateDirectory(m_dir + Path.DirectorySeparatorChar + asset.FullID.Data[0]); - - if (!Directory.Exists(cdir)) - Directory.CreateDirectory(cdir); - - FileStream x = new FileStream(cdir + Path.DirectorySeparatorChar + asset.FullID + ".xml", FileMode.Create); - m_xs.Serialize(x, asset); - - x.Flush(); - x.Close(); - } - - public override void UpdateAsset(AssetBase asset) - { - StoreAsset(asset); - } - - protected override AssetBase GetAsset(AssetRequest req) - { - string cdir = m_dir + Path.DirectorySeparatorChar + req.AssetID.Data[0] - + Path.DirectorySeparatorChar + req.AssetID.Data[1]; - if (File.Exists(cdir + Path.DirectorySeparatorChar + req.AssetID + ".xml")) - { - FileStream x = File.OpenRead(cdir + Path.DirectorySeparatorChar + req.AssetID + ".xml"); - AssetBase ret = (AssetBase) m_xs.Deserialize(x); - x.Close(); - return ret; - } - return null; - } - } -} +using System.IO; +using System.Xml.Serialization; + +namespace OpenSim.Framework.Communications.Cache +{ + public class FileAssetClient : AssetServerBase + { + private readonly string m_dir; + private readonly XmlSerializer m_xs = new XmlSerializer(typeof(AssetBase)); + + public FileAssetClient(string dir) + { + if(!Directory.Exists(dir)) + { + Directory.CreateDirectory(dir); + } + m_dir = dir; + } + public override void StoreAsset(AssetBase asset) + { + string cdir = m_dir + Path.DirectorySeparatorChar + asset.FullID.Data[0] + + Path.DirectorySeparatorChar + asset.FullID.Data[1]; + + if (!Directory.Exists(m_dir + Path.DirectorySeparatorChar + asset.FullID.Data[0])) + Directory.CreateDirectory(m_dir + Path.DirectorySeparatorChar + asset.FullID.Data[0]); + + if (!Directory.Exists(cdir)) + Directory.CreateDirectory(cdir); + + FileStream x = new FileStream(cdir + Path.DirectorySeparatorChar + asset.FullID + ".xml", FileMode.Create); + m_xs.Serialize(x, asset); + + x.Flush(); + x.Close(); + } + + public override void UpdateAsset(AssetBase asset) + { + StoreAsset(asset); + } + + protected override AssetBase GetAsset(AssetRequest req) + { + string cdir = m_dir + Path.DirectorySeparatorChar + req.AssetID.Data[0] + + Path.DirectorySeparatorChar + req.AssetID.Data[1]; + if (File.Exists(cdir + Path.DirectorySeparatorChar + req.AssetID + ".xml")) + { + FileStream x = File.OpenRead(cdir + Path.DirectorySeparatorChar + req.AssetID + ".xml"); + AssetBase ret = (AssetBase) m_xs.Deserialize(x); + x.Close(); + return ret; + } + return null; + } + } +}