diff options
Diffstat (limited to '')
-rw-r--r-- | OpenSim/Region/CoreModules/ServiceConnectorsOut/Inventory/LocalInventoryServiceConnector.cs | 13 |
1 files changed, 8 insertions, 5 deletions
diff --git a/OpenSim/Region/CoreModules/ServiceConnectorsOut/Inventory/LocalInventoryServiceConnector.cs b/OpenSim/Region/CoreModules/ServiceConnectorsOut/Inventory/LocalInventoryServiceConnector.cs index 65e39c0..d3ef08d 100644 --- a/OpenSim/Region/CoreModules/ServiceConnectorsOut/Inventory/LocalInventoryServiceConnector.cs +++ b/OpenSim/Region/CoreModules/ServiceConnectorsOut/Inventory/LocalInventoryServiceConnector.cs | |||
@@ -47,9 +47,12 @@ namespace OpenSim.Region.CoreModules.ServiceConnectorsOut.Inventory | |||
47 | LogManager.GetLogger( | 47 | LogManager.GetLogger( |
48 | MethodBase.GetCurrentMethod().DeclaringType); | 48 | MethodBase.GetCurrentMethod().DeclaringType); |
49 | 49 | ||
50 | private IInventoryService m_InventoryService; | 50 | /// <summary> |
51 | /// Scene used by this module. This currently needs to be publicly settable for HGInventoryBroker. | ||
52 | /// </summary> | ||
53 | public Scene Scene { get; set; } | ||
51 | 54 | ||
52 | private Scene m_Scene; | 55 | private IInventoryService m_InventoryService; |
53 | 56 | ||
54 | private IUserManagement m_UserManager; | 57 | private IUserManagement m_UserManager; |
55 | private IUserManagement UserManager | 58 | private IUserManagement UserManager |
@@ -58,7 +61,7 @@ namespace OpenSim.Region.CoreModules.ServiceConnectorsOut.Inventory | |||
58 | { | 61 | { |
59 | if (m_UserManager == null) | 62 | if (m_UserManager == null) |
60 | { | 63 | { |
61 | m_UserManager = m_Scene.RequestModuleInterface<IUserManagement>(); | 64 | m_UserManager = Scene.RequestModuleInterface<IUserManagement>(); |
62 | } | 65 | } |
63 | return m_UserManager; | 66 | return m_UserManager; |
64 | } | 67 | } |
@@ -131,8 +134,8 @@ namespace OpenSim.Region.CoreModules.ServiceConnectorsOut.Inventory | |||
131 | 134 | ||
132 | scene.RegisterModuleInterface<IInventoryService>(this); | 135 | scene.RegisterModuleInterface<IInventoryService>(this); |
133 | 136 | ||
134 | if (m_Scene == null) | 137 | if (Scene == null) |
135 | m_Scene = scene; | 138 | Scene = scene; |
136 | } | 139 | } |
137 | 140 | ||
138 | public void RemoveRegion(Scene scene) | 141 | public void RemoveRegion(Scene scene) |