aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Region/Communications/Local/CommunicationsLocal.cs
diff options
context:
space:
mode:
authorJustin Clarke Casey2009-05-05 16:45:21 +0000
committerJustin Clarke Casey2009-05-05 16:45:21 +0000
commitf8e0653e73932bae20f483e0ce669f1623c6ff1e (patch)
tree9fc902fc17567755bad28f0f6d88b7089c0365e1 /OpenSim/Region/Communications/Local/CommunicationsLocal.cs
parent- moving banned check and public/private check to (diff)
downloadopensim-SC-f8e0653e73932bae20f483e0ce669f1623c6ff1e.zip
opensim-SC-f8e0653e73932bae20f483e0ce669f1623c6ff1e.tar.gz
opensim-SC-f8e0653e73932bae20f483e0ce669f1623c6ff1e.tar.bz2
opensim-SC-f8e0653e73932bae20f483e0ce669f1623c6ff1e.tar.xz
* If an item creator id contains an iar loaded name, create a temporary profile and hashed UUID to represent the user
Diffstat (limited to 'OpenSim/Region/Communications/Local/CommunicationsLocal.cs')
-rw-r--r--OpenSim/Region/Communications/Local/CommunicationsLocal.cs23
1 files changed, 19 insertions, 4 deletions
diff --git a/OpenSim/Region/Communications/Local/CommunicationsLocal.cs b/OpenSim/Region/Communications/Local/CommunicationsLocal.cs
index acb7496..60feee1 100644
--- a/OpenSim/Region/Communications/Local/CommunicationsLocal.cs
+++ b/OpenSim/Region/Communications/Local/CommunicationsLocal.cs
@@ -25,9 +25,12 @@
25 * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. 25 * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
26 */ 26 */
27 27
28using System.Collections.Generic;
29using OpenSim.Data;
28using OpenSim.Framework; 30using OpenSim.Framework;
29using OpenSim.Framework.Communications; 31using OpenSim.Framework.Communications;
30using OpenSim.Framework.Communications.Cache; 32using OpenSim.Framework.Communications.Cache;
33using OpenSim.Framework.Communications.Osp;
31using OpenSim.Framework.Servers.HttpServer; 34using OpenSim.Framework.Servers.HttpServer;
32 35
33namespace OpenSim.Region.Communications.Local 36namespace OpenSim.Region.Communications.Local
@@ -39,12 +42,22 @@ namespace OpenSim.Region.Communications.Local
39 NetworkServersInfo serversInfo, 42 NetworkServersInfo serversInfo,
40 BaseHttpServer httpServer, 43 BaseHttpServer httpServer,
41 IAssetCache assetCache, 44 IAssetCache assetCache,
42 LocalInventoryService inventoryService,
43 IGridServices gridService,
44 LibraryRootFolder libraryRootFolder, 45 LibraryRootFolder libraryRootFolder,
45 bool dumpAssetsToFile) 46 bool dumpAssetsToFile)
46 : base(serversInfo, httpServer, assetCache, dumpAssetsToFile, libraryRootFolder) 47 : base(serversInfo, httpServer, assetCache, dumpAssetsToFile, libraryRootFolder)
47 { 48 {
49 LocalInventoryService inventoryService = new LocalInventoryService();
50 List<IInventoryDataPlugin> plugins
51 = DataPluginFactory.LoadDataPlugins<IInventoryDataPlugin>(
52 configSettings.StandaloneInventoryPlugin,
53 configSettings.StandaloneInventorySource);
54
55 foreach (IInventoryDataPlugin plugin in plugins)
56 {
57 // Using the OSP wrapper plugin for database plugins should be made configurable at some point
58 inventoryService.AddPlugin(new OspInventoryWrapperPlugin(plugin, this));
59 }
60
48 AddInventoryService(inventoryService); 61 AddInventoryService(inventoryService);
49 m_defaultInventoryHost = inventoryService.Host; 62 m_defaultInventoryHost = inventoryService.Host;
50 m_interServiceInventoryService = inventoryService; 63 m_interServiceInventoryService = inventoryService;
@@ -58,8 +71,10 @@ namespace OpenSim.Region.Communications.Local
58 m_userAdminService = lus; 71 m_userAdminService = lus;
59 m_avatarService = lus; 72 m_avatarService = lus;
60 m_messageService = lus; 73 m_messageService = lus;
61 74
62 m_gridService = gridService; 75 m_gridService = new LocalBackEndServices();
76
77 //LocalLoginService loginService = CreateLoginService(libraryRootFolder, inventoryService, userService, backendService);
63 } 78 }
64 } 79 }
65} 80}