Merge branch 'master' of ssh://melanie@opensimulator.org/var/git/opensim

0.6.8-post-fixes
Melanie 2009-09-30 11:17:27 +01:00
commit 377a8b5229
4 changed files with 10 additions and 1 deletions

View File

@ -109,6 +109,9 @@ namespace OpenSim.Region.CoreModules.ServiceConnectorsIn.Grid
public void RegionLoaded(Scene scene)
{
if (!m_Enabled)
return;
if (!m_Registered)
{
m_Registered = true;

View File

@ -107,7 +107,7 @@ namespace OpenSim.Region.CoreModules.ServiceConnectorsOut.Inventory
public void AddRegion(Scene scene)
{
m_Scene = scene;
m_log.Debug("[XXXX] Adding scene " + m_Scene.RegionInfo.RegionName);
//m_log.Debug("[XXXX] Adding scene " + m_Scene.RegionInfo.RegionName);
if (!m_Enabled)
return;

View File

@ -7,6 +7,9 @@
[Includes]
Include-Common = "config-include/GridCommon.ini"
[Startup]
hypergrid = true
[Modules]
AssetServices = "HGAssetBroker"
InventoryServices = "HGInventoryBroker"

View File

@ -7,6 +7,9 @@
[Includes]
Include-Common = "config-include/StandaloneCommon.ini"
[Startup]
hypergrid = true
[Modules]
AssetServices = "HGAssetBroker"
InventoryServices = "HGInventoryBroker"