diff options
author | Diva Canto | 2009-09-29 16:13:07 -0700 |
---|---|---|
committer | Diva Canto | 2009-09-29 16:13:07 -0700 |
commit | b1d204802fa1c07e3b00d0b363346673b763d67b (patch) | |
tree | dc741866a0f7e4a0d8fafe35a76ee105470392d3 | |
parent | Merge branch 'master' of ssh://diva@opensimulator.org/var/git/opensim (diff) | |
download | opensim-SC_OLD-b1d204802fa1c07e3b00d0b363346673b763d67b.zip opensim-SC_OLD-b1d204802fa1c07e3b00d0b363346673b763d67b.tar.gz opensim-SC_OLD-b1d204802fa1c07e3b00d0b363346673b763d67b.tar.bz2 opensim-SC_OLD-b1d204802fa1c07e3b00d0b363346673b763d67b.tar.xz |
Minor bug fixes.
Diffstat (limited to '')
4 files changed, 10 insertions, 1 deletions
diff --git a/OpenSim/Region/CoreModules/ServiceConnectorsIn/Grid/HypergridServiceInConnectorModule.cs b/OpenSim/Region/CoreModules/ServiceConnectorsIn/Grid/HypergridServiceInConnectorModule.cs index 9bf31a4..92db15b 100644 --- a/OpenSim/Region/CoreModules/ServiceConnectorsIn/Grid/HypergridServiceInConnectorModule.cs +++ b/OpenSim/Region/CoreModules/ServiceConnectorsIn/Grid/HypergridServiceInConnectorModule.cs | |||
@@ -109,6 +109,9 @@ namespace OpenSim.Region.CoreModules.ServiceConnectorsIn.Grid | |||
109 | 109 | ||
110 | public void RegionLoaded(Scene scene) | 110 | public void RegionLoaded(Scene scene) |
111 | { | 111 | { |
112 | if (!m_Enabled) | ||
113 | return; | ||
114 | |||
112 | if (!m_Registered) | 115 | if (!m_Registered) |
113 | { | 116 | { |
114 | m_Registered = true; | 117 | m_Registered = true; |
diff --git a/OpenSim/Region/CoreModules/ServiceConnectorsOut/Inventory/RemoteInventoryServiceConnector.cs b/OpenSim/Region/CoreModules/ServiceConnectorsOut/Inventory/RemoteInventoryServiceConnector.cs index 0d32c77..69504df 100644 --- a/OpenSim/Region/CoreModules/ServiceConnectorsOut/Inventory/RemoteInventoryServiceConnector.cs +++ b/OpenSim/Region/CoreModules/ServiceConnectorsOut/Inventory/RemoteInventoryServiceConnector.cs | |||
@@ -107,7 +107,7 @@ namespace OpenSim.Region.CoreModules.ServiceConnectorsOut.Inventory | |||
107 | public void AddRegion(Scene scene) | 107 | public void AddRegion(Scene scene) |
108 | { | 108 | { |
109 | m_Scene = scene; | 109 | m_Scene = scene; |
110 | m_log.Debug("[XXXX] Adding scene " + m_Scene.RegionInfo.RegionName); | 110 | //m_log.Debug("[XXXX] Adding scene " + m_Scene.RegionInfo.RegionName); |
111 | 111 | ||
112 | if (!m_Enabled) | 112 | if (!m_Enabled) |
113 | return; | 113 | return; |
diff --git a/bin/config-include/GridHypergrid.ini b/bin/config-include/GridHypergrid.ini index 1bfcf89..f5aa603 100644 --- a/bin/config-include/GridHypergrid.ini +++ b/bin/config-include/GridHypergrid.ini | |||
@@ -7,6 +7,9 @@ | |||
7 | [Includes] | 7 | [Includes] |
8 | Include-Common = "config-include/GridCommon.ini" | 8 | Include-Common = "config-include/GridCommon.ini" |
9 | 9 | ||
10 | [Startup] | ||
11 | hypergrid = true | ||
12 | |||
10 | [Modules] | 13 | [Modules] |
11 | AssetServices = "HGAssetBroker" | 14 | AssetServices = "HGAssetBroker" |
12 | InventoryServices = "HGInventoryBroker" | 15 | InventoryServices = "HGInventoryBroker" |
diff --git a/bin/config-include/StandaloneHypergrid.ini b/bin/config-include/StandaloneHypergrid.ini index 75cdad9..baff811 100644 --- a/bin/config-include/StandaloneHypergrid.ini +++ b/bin/config-include/StandaloneHypergrid.ini | |||
@@ -7,6 +7,9 @@ | |||
7 | [Includes] | 7 | [Includes] |
8 | Include-Common = "config-include/StandaloneCommon.ini" | 8 | Include-Common = "config-include/StandaloneCommon.ini" |
9 | 9 | ||
10 | [Startup] | ||
11 | hypergrid = true | ||
12 | |||
10 | [Modules] | 13 | [Modules] |
11 | AssetServices = "HGAssetBroker" | 14 | AssetServices = "HGAssetBroker" |
12 | InventoryServices = "HGInventoryBroker" | 15 | InventoryServices = "HGInventoryBroker" |