diff options
| author | Melanie | 2009-09-30 11:17:27 +0100 |
|---|---|---|
| committer | Melanie | 2009-09-30 11:17:27 +0100 |
| commit | 377a8b5229ba6053392f05eeaf24a7c4e46a8a9f (patch) | |
| tree | bfb4c31b0ca6a47049064164ccc585d2c7992407 /OpenSim | |
| parent | Change command help text to show .ini in place of .xml when creating regions (diff) | |
| parent | Merge branch 'master' of ssh://diva@opensimulator.org/var/git/opensim (diff) | |
| download | opensim-SC_OLD-377a8b5229ba6053392f05eeaf24a7c4e46a8a9f.zip opensim-SC_OLD-377a8b5229ba6053392f05eeaf24a7c4e46a8a9f.tar.gz opensim-SC_OLD-377a8b5229ba6053392f05eeaf24a7c4e46a8a9f.tar.bz2 opensim-SC_OLD-377a8b5229ba6053392f05eeaf24a7c4e46a8a9f.tar.xz | |
Merge branch 'master' of ssh://melanie@opensimulator.org/var/git/opensim
Diffstat (limited to 'OpenSim')
2 files changed, 4 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; |