diff options
author | Justin Clarke Casey | 2009-05-05 16:45:21 +0000 |
---|---|---|
committer | Justin Clarke Casey | 2009-05-05 16:45:21 +0000 |
commit | f8e0653e73932bae20f483e0ce669f1623c6ff1e (patch) | |
tree | 9fc902fc17567755bad28f0f6d88b7089c0365e1 /OpenSim/Region/Communications | |
parent | - moving banned check and public/private check to (diff) | |
download | opensim-SC_OLD-f8e0653e73932bae20f483e0ce669f1623c6ff1e.zip opensim-SC_OLD-f8e0653e73932bae20f483e0ce669f1623c6ff1e.tar.gz opensim-SC_OLD-f8e0653e73932bae20f483e0ce669f1623c6ff1e.tar.bz2 opensim-SC_OLD-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 '')
-rw-r--r-- | OpenSim/Region/Communications/Hypergrid/HGCommunicationsStandalone.cs | 18 | ||||
-rw-r--r-- | OpenSim/Region/Communications/Local/CommunicationsLocal.cs | 23 |
2 files changed, 36 insertions, 5 deletions
diff --git a/OpenSim/Region/Communications/Hypergrid/HGCommunicationsStandalone.cs b/OpenSim/Region/Communications/Hypergrid/HGCommunicationsStandalone.cs index f5789b7..5c2fe33 100644 --- a/OpenSim/Region/Communications/Hypergrid/HGCommunicationsStandalone.cs +++ b/OpenSim/Region/Communications/Hypergrid/HGCommunicationsStandalone.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 | ||
28 | using System.Collections.Generic; | ||
29 | using OpenSim.Data; | ||
28 | using OpenSim.Framework; | 30 | using OpenSim.Framework; |
29 | using OpenSim.Framework.Communications; | 31 | using OpenSim.Framework.Communications; |
30 | using OpenSim.Framework.Communications.Cache; | 32 | using OpenSim.Framework.Communications.Cache; |
33 | using OpenSim.Framework.Communications.Osp; | ||
31 | using OpenSim.Framework.Servers; | 34 | using OpenSim.Framework.Servers; |
32 | using OpenSim.Framework.Servers.HttpServer; | 35 | using OpenSim.Framework.Servers.HttpServer; |
33 | using OpenSim.Region.Communications.Local; | 36 | using OpenSim.Region.Communications.Local; |
@@ -42,7 +45,6 @@ namespace OpenSim.Region.Communications.Hypergrid | |||
42 | NetworkServersInfo serversInfo, | 45 | NetworkServersInfo serversInfo, |
43 | BaseHttpServer httpServer, | 46 | BaseHttpServer httpServer, |
44 | IAssetCache assetCache, | 47 | IAssetCache assetCache, |
45 | LocalInventoryService inventoryService, | ||
46 | HGGridServices gridService, | 48 | HGGridServices gridService, |
47 | LibraryRootFolder libraryRootFolder, | 49 | LibraryRootFolder libraryRootFolder, |
48 | bool dumpAssetsToFile) | 50 | bool dumpAssetsToFile) |
@@ -52,10 +54,24 @@ namespace OpenSim.Region.Communications.Hypergrid | |||
52 | new LocalUserServices( | 54 | new LocalUserServices( |
53 | serversInfo.DefaultHomeLocX, serversInfo.DefaultHomeLocY, this); | 55 | serversInfo.DefaultHomeLocX, serversInfo.DefaultHomeLocY, this); |
54 | localUserService.AddPlugin(configSettings.StandaloneUserPlugin, configSettings.StandaloneUserSource); | 56 | localUserService.AddPlugin(configSettings.StandaloneUserPlugin, configSettings.StandaloneUserSource); |
57 | |||
58 | HGInventoryServiceClient inventoryService | ||
59 | = new HGInventoryServiceClient(serversInfo.InventoryURL, null, false); | ||
60 | List<IInventoryDataPlugin> plugins | ||
61 | = DataPluginFactory.LoadDataPlugins<IInventoryDataPlugin>( | ||
62 | configSettings.StandaloneInventoryPlugin, | ||
63 | configSettings.StandaloneInventorySource); | ||
64 | |||
65 | foreach (IInventoryDataPlugin plugin in plugins) | ||
66 | { | ||
67 | // Using the OSP wrapper plugin should be made configurable at some point | ||
68 | inventoryService.AddPlugin(new OspInventoryWrapperPlugin(plugin, this)); | ||
69 | } | ||
55 | 70 | ||
56 | AddInventoryService(inventoryService); | 71 | AddInventoryService(inventoryService); |
57 | m_defaultInventoryHost = inventoryService.Host; | 72 | m_defaultInventoryHost = inventoryService.Host; |
58 | m_interServiceInventoryService = inventoryService; | 73 | m_interServiceInventoryService = inventoryService; |
74 | inventoryService.UserProfileCache = UserProfileCacheService; | ||
59 | 75 | ||
60 | m_assetCache = assetCache; | 76 | m_assetCache = assetCache; |
61 | // Let's swap to always be secure access to inventory | 77 | // Let's swap to always be secure access to inventory |
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 | ||
28 | using System.Collections.Generic; | ||
29 | using OpenSim.Data; | ||
28 | using OpenSim.Framework; | 30 | using OpenSim.Framework; |
29 | using OpenSim.Framework.Communications; | 31 | using OpenSim.Framework.Communications; |
30 | using OpenSim.Framework.Communications.Cache; | 32 | using OpenSim.Framework.Communications.Cache; |
33 | using OpenSim.Framework.Communications.Osp; | ||
31 | using OpenSim.Framework.Servers.HttpServer; | 34 | using OpenSim.Framework.Servers.HttpServer; |
32 | 35 | ||
33 | namespace OpenSim.Region.Communications.Local | 36 | namespace 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 | } |