diff options
Diffstat (limited to '')
-rw-r--r-- | OpenSim/Region/CoreModules/Asset/FlotsamAssetCache.cs | 6 | ||||
-rw-r--r-- | OpenSim/Region/CoreModules/Properties/AssemblyInfo.cs | 2 |
2 files changed, 3 insertions, 5 deletions
diff --git a/OpenSim/Region/CoreModules/Asset/FlotsamAssetCache.cs b/OpenSim/Region/CoreModules/Asset/FlotsamAssetCache.cs index 81c9284..b1bb56b 100644 --- a/OpenSim/Region/CoreModules/Asset/FlotsamAssetCache.cs +++ b/OpenSim/Region/CoreModules/Asset/FlotsamAssetCache.cs | |||
@@ -222,10 +222,6 @@ namespace OpenSim.Region.CoreModules.Asset | |||
222 | scene.RegisterModuleInterface<IImprovedAssetCache>(this); | 222 | scene.RegisterModuleInterface<IImprovedAssetCache>(this); |
223 | m_Scenes.Add(scene); | 223 | m_Scenes.Add(scene); |
224 | 224 | ||
225 | if (m_AssetService == null) | ||
226 | { | ||
227 | m_AssetService = scene.RequestModuleInterface<IAssetService>(); | ||
228 | } | ||
229 | } | 225 | } |
230 | } | 226 | } |
231 | 227 | ||
@@ -240,6 +236,8 @@ namespace OpenSim.Region.CoreModules.Asset | |||
240 | 236 | ||
241 | public void RegionLoaded(Scene scene) | 237 | public void RegionLoaded(Scene scene) |
242 | { | 238 | { |
239 | if (m_Enabled && m_AssetService == null) | ||
240 | m_AssetService = scene.RequestModuleInterface<IAssetService>(); | ||
243 | } | 241 | } |
244 | 242 | ||
245 | //////////////////////////////////////////////////////////// | 243 | //////////////////////////////////////////////////////////// |
diff --git a/OpenSim/Region/CoreModules/Properties/AssemblyInfo.cs b/OpenSim/Region/CoreModules/Properties/AssemblyInfo.cs index 5b8898b..5a8c4a2 100644 --- a/OpenSim/Region/CoreModules/Properties/AssemblyInfo.cs +++ b/OpenSim/Region/CoreModules/Properties/AssemblyInfo.cs | |||
@@ -30,7 +30,7 @@ using Mono.Addins; | |||
30 | // Build Number | 30 | // Build Number |
31 | // Revision | 31 | // Revision |
32 | // | 32 | // |
33 | [assembly: AssemblyVersion("1.0.0.0")] | 33 | [assembly: AssemblyVersion("0.7.5.*")] |
34 | [assembly: AssemblyFileVersion("1.0.0.0")] | 34 | [assembly: AssemblyFileVersion("1.0.0.0")] |
35 | 35 | ||
36 | [assembly: Addin("OpenSim.Region.CoreModules", "0.1")] | 36 | [assembly: Addin("OpenSim.Region.CoreModules", "0.1")] |