diff options
author | Justin Clarke Casey | 2009-06-12 15:41:53 +0000 |
---|---|---|
committer | Justin Clarke Casey | 2009-06-12 15:41:53 +0000 |
commit | 45342067f5f5d5f6ca86f9ed179f275ed6131fea (patch) | |
tree | 837791d248127f5605ea3dacefb6bee6763863ed /OpenSim/Region | |
parent | Give m_test* methods more reasonable names (diff) | |
download | opensim-SC_OLD-45342067f5f5d5f6ca86f9ed179f275ed6131fea.zip opensim-SC_OLD-45342067f5f5d5f6ca86f9ed179f275ed6131fea.tar.gz opensim-SC_OLD-45342067f5f5d5f6ca86f9ed179f275ed6131fea.tar.bz2 opensim-SC_OLD-45342067f5f5d5f6ca86f9ed179f275ed6131fea.tar.xz |
* Move standalone login setup in LLStandaloneLoginmodule to RegionLoaded() from AddRegion()
* This is necessary to avoid a dependency problem where LLStandaloneLoginModule references IInventoryService before the LocalInventoryServiceConnector is registered
* Correct some copypasta log messages in LocalInventoryServiceConnector
Diffstat (limited to '')
-rw-r--r-- | OpenSim/Region/CoreModules/ServiceConnectors/Inventory/LocalInventoryServiceConnector.cs | 11 |
1 files changed, 7 insertions, 4 deletions
diff --git a/OpenSim/Region/CoreModules/ServiceConnectors/Inventory/LocalInventoryServiceConnector.cs b/OpenSim/Region/CoreModules/ServiceConnectors/Inventory/LocalInventoryServiceConnector.cs index 69a37a9..bc833c3 100644 --- a/OpenSim/Region/CoreModules/ServiceConnectors/Inventory/LocalInventoryServiceConnector.cs +++ b/OpenSim/Region/CoreModules/ServiceConnectors/Inventory/LocalInventoryServiceConnector.cs | |||
@@ -105,7 +105,7 @@ namespace OpenSim.Region.CoreModules.ServiceConnectors.Inventory | |||
105 | //} | 105 | //} |
106 | 106 | ||
107 | m_Enabled = true; | 107 | m_Enabled = true; |
108 | m_log.Info("[INVENTORY CONNECTOR]: Local asset connector enabled"); | 108 | m_log.Info("[INVENTORY CONNECTOR]: Local inventory connector enabled"); |
109 | } | 109 | } |
110 | } | 110 | } |
111 | } | 111 | } |
@@ -120,6 +120,7 @@ namespace OpenSim.Region.CoreModules.ServiceConnectors.Inventory | |||
120 | 120 | ||
121 | public void AddRegion(Scene scene) | 121 | public void AddRegion(Scene scene) |
122 | { | 122 | { |
123 | m_log.DebugFormat("HEEEERE"); | ||
123 | if (!m_Enabled) | 124 | if (!m_Enabled) |
124 | return; | 125 | return; |
125 | 126 | ||
@@ -131,8 +132,10 @@ namespace OpenSim.Region.CoreModules.ServiceConnectors.Inventory | |||
131 | m_Initialized = true; | 132 | m_Initialized = true; |
132 | } | 133 | } |
133 | 134 | ||
135 | m_log.DebugFormat( | ||
136 | "[INVENTORY CONNECTOR]: Registering IInventoryService to scene {0}", scene.RegionInfo.RegionName); | ||
137 | |||
134 | scene.RegisterModuleInterface<IInventoryService>(this); | 138 | scene.RegisterModuleInterface<IInventoryService>(this); |
135 | |||
136 | } | 139 | } |
137 | 140 | ||
138 | public void RemoveRegion(Scene scene) | 141 | public void RemoveRegion(Scene scene) |
@@ -144,8 +147,8 @@ namespace OpenSim.Region.CoreModules.ServiceConnectors.Inventory | |||
144 | if (!m_Enabled) | 147 | if (!m_Enabled) |
145 | return; | 148 | return; |
146 | 149 | ||
147 | m_log.InfoFormat("[INVENTORY CONNECTOR]: Enabled local assets for region {0}", scene.RegionInfo.RegionName); | 150 | m_log.InfoFormat( |
148 | 151 | "[INVENTORY CONNECTOR]: Enabled local invnetory for region {0}", scene.RegionInfo.RegionName); | |
149 | } | 152 | } |
150 | 153 | ||
151 | #region IInventoryService | 154 | #region IInventoryService |