diff options
| author | Justin Clarke Casey | 2007-12-28 22:13:43 +0000 |
|---|---|---|
| committer | Justin Clarke Casey | 2007-12-28 22:13:43 +0000 |
| commit | 4ae10034bd929c6451633c6fc5172c44e9280fa4 (patch) | |
| tree | bf3abf3e79787ddfa72c645e977e126c61273845 /OpenSim/Framework/Communications/Cache/AssetServer.cs | |
| parent | * applied melanie's matnis patch #255. Thanks Melanie. (diff) | |
| download | opensim-SC-4ae10034bd929c6451633c6fc5172c44e9280fa4.zip opensim-SC-4ae10034bd929c6451633c6fc5172c44e9280fa4.tar.gz opensim-SC-4ae10034bd929c6451633c6fc5172c44e9280fa4.tar.bz2 opensim-SC-4ae10034bd929c6451633c6fc5172c44e9280fa4.tar.xz | |
Factor out common asset loading from AssetServerBase and Grid/AssetServer/Main
Diffstat (limited to 'OpenSim/Framework/Communications/Cache/AssetServer.cs')
| -rw-r--r-- | OpenSim/Framework/Communications/Cache/AssetServer.cs | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/OpenSim/Framework/Communications/Cache/AssetServer.cs b/OpenSim/Framework/Communications/Cache/AssetServer.cs index 692ee1e..575e80a 100644 --- a/OpenSim/Framework/Communications/Cache/AssetServer.cs +++ b/OpenSim/Framework/Communications/Cache/AssetServer.cs | |||
| @@ -122,8 +122,7 @@ namespace OpenSim.Framework.Communications.Cache | |||
| 122 | { | 122 | { |
| 123 | MainLog.Instance.Verbose("LOCAL ASSET SERVER", "Setting up asset database"); | 123 | MainLog.Instance.Verbose("LOCAL ASSET SERVER", "Setting up asset database"); |
| 124 | 124 | ||
| 125 | ForEachDefaultAsset(StoreAsset); | 125 | base.LoadDefaultAssets(); |
| 126 | ForEachXmlAsset(StoreAsset); | ||
| 127 | } | 126 | } |
| 128 | } | 127 | } |
| 129 | 128 | ||