ogb912/opensim
1
0
Fork 0
mirror of https://github.com/opensim/opensim.git synced 2026-08-11 03:45:35 +08:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'master' into careminster

Browse Source
This commit is contained in:
Melanie
2012-11-15 00:43:26 +00:00
parent 556d70feef 35fd4474b2
commit 06fa1681ae
73 changed files with 1470 additions and 409 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
OpenSim/Region/CoreModules/Asset/FlotsamAssetCache.cs
View File

@@ -222,10 +222,6 @@ namespace OpenSim.Region.CoreModules.Asset
scene.RegisterModuleInterface<IImprovedAssetCache>(this);
m_Scenes.Add(scene);
if (m_AssetService == null)
{
m_AssetService = scene.RequestModuleInterface<IAssetService>();
}
}
}
@@ -240,6 +236,8 @@ namespace OpenSim.Region.CoreModules.Asset
public void RegionLoaded(Scene scene)
{
if (m_Enabled && m_AssetService == null)
m_AssetService = scene.RequestModuleInterface<IAssetService>();
}
////////////////////////////////////////////////////////////

2
OpenSim/Region/CoreModules/Properties/AssemblyInfo.cs
View File

@@ -30,7 +30,7 @@ using Mono.Addins;
// Build Number
// Revision
//
[assembly: AssemblyVersion("1.0.0.0")]
[assembly: AssemblyVersion("0.7.5.*")]
[assembly: AssemblyFileVersion("1.0.0.0")]
[assembly: Addin("OpenSim.Region.CoreModules", "0.1")]