diff options
author | Diva Canto | 2010-02-22 09:56:33 -0800 |
---|---|---|
committer | Diva Canto | 2010-02-22 09:56:33 -0800 |
commit | de91a9e09bbb6c41eeb022540ae08952f413fb12 (patch) | |
tree | f4a40f7999f9c55661162b2764c883f764597973 /OpenSim/Region/CoreModules/Asset/CenomeAssetCache.cs | |
parent | Deleted duplicate [GridService] section. (diff) | |
parent | Merge branch 'master' into presence-refactor (diff) | |
download | opensim-SC_OLD-de91a9e09bbb6c41eeb022540ae08952f413fb12.zip opensim-SC_OLD-de91a9e09bbb6c41eeb022540ae08952f413fb12.tar.gz opensim-SC_OLD-de91a9e09bbb6c41eeb022540ae08952f413fb12.tar.bz2 opensim-SC_OLD-de91a9e09bbb6c41eeb022540ae08952f413fb12.tar.xz |
Merge branch 'presence-refactor' of ssh://diva@opensimulator.org/var/git/opensim into presence-refactor
Diffstat (limited to 'OpenSim/Region/CoreModules/Asset/CenomeAssetCache.cs')
-rw-r--r-- | OpenSim/Region/CoreModules/Asset/CenomeAssetCache.cs | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/OpenSim/Region/CoreModules/Asset/CenomeAssetCache.cs b/OpenSim/Region/CoreModules/Asset/CenomeAssetCache.cs index 1903eb9..b1b7b27 100644 --- a/OpenSim/Region/CoreModules/Asset/CenomeAssetCache.cs +++ b/OpenSim/Region/CoreModules/Asset/CenomeAssetCache.cs | |||
@@ -330,7 +330,7 @@ namespace OpenSim.Region.CoreModules.Asset | |||
330 | //m_log.DebugFormat("[XXX] name = {0} (this module's name: {1}", name, Name); | 330 | //m_log.DebugFormat("[XXX] name = {0} (this module's name: {1}", name, Name); |
331 | 331 | ||
332 | if (name != Name) | 332 | if (name != Name) |
333 | return; | 333 | return; |
334 | 334 | ||
335 | long maxSize = DefaultMaxSize; | 335 | long maxSize = DefaultMaxSize; |
336 | int maxCount = DefaultMaxCount; | 336 | int maxCount = DefaultMaxCount; |