diff options
author | diva | 2009-06-10 13:18:32 +0000 |
---|---|---|
committer | diva | 2009-06-10 13:18:32 +0000 |
commit | 0f367bd7bbc5d22d4834e1eb0f1671381485143e (patch) | |
tree | eeb4290f1146601f8fd97dc164e0a7f247a2fafb /OpenSim/Region/Framework/Scenes | |
parent | From: Alan Webb <alan_webb@us.ibm.com> (diff) | |
download | opensim-SC_OLD-0f367bd7bbc5d22d4834e1eb0f1671381485143e.zip opensim-SC_OLD-0f367bd7bbc5d22d4834e1eb0f1671381485143e.tar.gz opensim-SC_OLD-0f367bd7bbc5d22d4834e1eb0f1671381485143e.tar.bz2 opensim-SC_OLD-0f367bd7bbc5d22d4834e1eb0f1671381485143e.tar.xz |
Heart surgery no.2: the inventory service hooks.
Several improvements in the connectors themselves.
Several improvements in configurations.
Needed to add a hack in IUserService and UserManagerBase, to be removed when that service is refactored.
Diffstat (limited to '')
-rw-r--r-- | OpenSim/Region/Framework/Scenes/Scene.cs | 20 |
1 files changed, 20 insertions, 0 deletions
diff --git a/OpenSim/Region/Framework/Scenes/Scene.cs b/OpenSim/Region/Framework/Scenes/Scene.cs index d18af46..5349d87 100644 --- a/OpenSim/Region/Framework/Scenes/Scene.cs +++ b/OpenSim/Region/Framework/Scenes/Scene.cs | |||
@@ -146,6 +146,26 @@ namespace OpenSim.Region.Framework.Scenes | |||
146 | } | 146 | } |
147 | } | 147 | } |
148 | 148 | ||
149 | protected IInventoryService m_InventoryService = null; | ||
150 | |||
151 | public IInventoryService InventoryService | ||
152 | { | ||
153 | get | ||
154 | { | ||
155 | if (m_InventoryService == null) | ||
156 | { | ||
157 | m_InventoryService = RequestModuleInterface<IInventoryService>(); | ||
158 | |||
159 | if (m_InventoryService == null) | ||
160 | { | ||
161 | throw new Exception("No IInventoryService available."); | ||
162 | } | ||
163 | } | ||
164 | |||
165 | return m_InventoryService; | ||
166 | } | ||
167 | } | ||
168 | |||
149 | protected IXMLRPC m_xmlrpcModule; | 169 | protected IXMLRPC m_xmlrpcModule; |
150 | protected IWorldComm m_worldCommModule; | 170 | protected IWorldComm m_worldCommModule; |
151 | protected IAvatarFactory m_AvatarFactory; | 171 | protected IAvatarFactory m_AvatarFactory; |