diff options
| author | lbsa71 | 2007-11-06 11:10:45 +0000 |
|---|---|---|
| committer | lbsa71 | 2007-11-06 11:10:45 +0000 |
| commit | ee1fcc729c9fe4df367a12ffe4a0d90c7378c160 (patch) | |
| tree | cc1ecc6f5fe304184ec7c371f950745c948e28a4 /OpenSim/Region | |
| parent | teravus debug patch of libode.so from libs (diff) | |
| download | opensim-SC-ee1fcc729c9fe4df367a12ffe4a0d90c7378c160.zip opensim-SC-ee1fcc729c9fe4df367a12ffe4a0d90c7378c160.tar.gz opensim-SC-ee1fcc729c9fe4df367a12ffe4a0d90c7378c160.tar.bz2 opensim-SC-ee1fcc729c9fe4df367a12ffe4a0d90c7378c160.tar.xz | |
* Added better logging to AssetCache
* AssetCache now ignores duplicate uploads
* some m_ refactoring
* ignored some bins
Diffstat (limited to 'OpenSim/Region')
| -rw-r--r-- | OpenSim/Region/Application/OpenSimMain.cs | 2 | ||||
| -rw-r--r-- | OpenSim/Region/Examples/SimpleApp/Program.cs | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/OpenSim/Region/Application/OpenSimMain.cs b/OpenSim/Region/Application/OpenSimMain.cs index 05d15c7..684a9a8 100644 --- a/OpenSim/Region/Application/OpenSimMain.cs +++ b/OpenSim/Region/Application/OpenSimMain.cs | |||
| @@ -386,7 +386,7 @@ namespace OpenSim | |||
| 386 | assetServer = sqlAssetServer; | 386 | assetServer = sqlAssetServer; |
| 387 | } | 387 | } |
| 388 | 388 | ||
| 389 | m_assetCache = new AssetCache(assetServer); | 389 | m_assetCache = new AssetCache(assetServer, m_log); |
| 390 | // m_assetCache = new assetCache("OpenSim.Region.GridInterfaces.Local.dll", m_networkServersInfo.AssetURL, m_networkServersInfo.AssetSendKey); | 390 | // m_assetCache = new assetCache("OpenSim.Region.GridInterfaces.Local.dll", m_networkServersInfo.AssetURL, m_networkServersInfo.AssetSendKey); |
| 391 | } | 391 | } |
| 392 | 392 | ||
diff --git a/OpenSim/Region/Examples/SimpleApp/Program.cs b/OpenSim/Region/Examples/SimpleApp/Program.cs index 6c54d52..875bc4c 100644 --- a/OpenSim/Region/Examples/SimpleApp/Program.cs +++ b/OpenSim/Region/Examples/SimpleApp/Program.cs | |||
| @@ -61,7 +61,7 @@ namespace SimpleApp | |||
| 61 | 61 | ||
| 62 | LocalAssetServer assetServer = new LocalAssetServer(); | 62 | LocalAssetServer assetServer = new LocalAssetServer(); |
| 63 | 63 | ||
| 64 | m_assetCache = new AssetCache(assetServer); | 64 | m_assetCache = new AssetCache(assetServer, m_log); |
| 65 | } | 65 | } |
| 66 | 66 | ||
| 67 | public void Run() | 67 | public void Run() |