diff options
Diffstat (limited to 'OpenSim/Region/Communications/OGS1')
-rw-r--r-- | OpenSim/Region/Communications/OGS1/CommunicationsOGS1.cs | 2 | ||||
-rw-r--r-- | OpenSim/Region/Communications/OGS1/OGS1InventoryService.cs | 4 |
2 files changed, 3 insertions, 3 deletions
diff --git a/OpenSim/Region/Communications/OGS1/CommunicationsOGS1.cs b/OpenSim/Region/Communications/OGS1/CommunicationsOGS1.cs index 8ebeeca..4be31d8 100644 --- a/OpenSim/Region/Communications/OGS1/CommunicationsOGS1.cs +++ b/OpenSim/Region/Communications/OGS1/CommunicationsOGS1.cs | |||
@@ -36,7 +36,7 @@ namespace OpenSim.Region.Communications.OGS1 | |||
36 | { | 36 | { |
37 | public class CommunicationsOGS1 : CommunicationsManager | 37 | public class CommunicationsOGS1 : CommunicationsManager |
38 | { | 38 | { |
39 | public CommunicationsOGS1(NetworkServersInfo serversInfo, BaseHttpServer httpServer, AssetCache assetCache ) :base(serversInfo, httpServer, assetCache) | 39 | public CommunicationsOGS1(NetworkServersInfo serversInfo, BaseHttpServer httpServer, AssetCache assetCache ) :base(serversInfo, httpServer, assetCache, false) |
40 | { | 40 | { |
41 | OGS1GridServices gridInterComms = new OGS1GridServices(serversInfo, httpServer); | 41 | OGS1GridServices gridInterComms = new OGS1GridServices(serversInfo, httpServer); |
42 | m_gridService = gridInterComms; | 42 | m_gridService = gridInterComms; |
diff --git a/OpenSim/Region/Communications/OGS1/OGS1InventoryService.cs b/OpenSim/Region/Communications/OGS1/OGS1InventoryService.cs index 77713af..d8f5a22 100644 --- a/OpenSim/Region/Communications/OGS1/OGS1InventoryService.cs +++ b/OpenSim/Region/Communications/OGS1/OGS1InventoryService.cs | |||
@@ -29,8 +29,8 @@ | |||
29 | using System.Collections.Generic; | 29 | using System.Collections.Generic; |
30 | using libsecondlife; | 30 | using libsecondlife; |
31 | using OpenSim.Framework.Communications; | 31 | using OpenSim.Framework.Communications; |
32 | using OpenSim.Framework.Communications.Cache; | ||
32 | using OpenSim.Framework.Types; | 33 | using OpenSim.Framework.Types; |
33 | using InventoryFolder = OpenSim.Framework.Communications.Caches.InventoryFolder; | ||
34 | 34 | ||
35 | 35 | ||
36 | namespace OpenSim.Region.Communications.OGS1 | 36 | namespace OpenSim.Region.Communications.OGS1 |
@@ -50,7 +50,7 @@ namespace OpenSim.Region.Communications.OGS1 | |||
50 | 50 | ||
51 | } | 51 | } |
52 | 52 | ||
53 | public void AddNewInventoryFolder(LLUUID userID, InventoryFolder folder) | 53 | public void AddNewInventoryFolder(LLUUID userID, InventoryFolderImpl folder) |
54 | { | 54 | { |
55 | 55 | ||
56 | } | 56 | } |