diff options
Diffstat (limited to '')
7 files changed, 8 insertions, 8 deletions
diff --git a/OpenSim/Region/Communications/Hypergrid/HGCommunicationsGridMode.cs b/OpenSim/Region/Communications/Hypergrid/HGCommunicationsGridMode.cs index c4d48a9..4de4b2b 100644 --- a/OpenSim/Region/Communications/Hypergrid/HGCommunicationsGridMode.cs +++ b/OpenSim/Region/Communications/Hypergrid/HGCommunicationsGridMode.cs | |||
@@ -51,7 +51,7 @@ namespace OpenSim.Region.Communications.Hypergrid | |||
51 | 51 | ||
52 | public HGCommunicationsGridMode( | 52 | public HGCommunicationsGridMode( |
53 | NetworkServersInfo serversInfo, BaseHttpServer httpServer, | 53 | NetworkServersInfo serversInfo, BaseHttpServer httpServer, |
54 | AssetCache assetCache, SceneManager sman, LibraryRootFolder libraryRootFolder) | 54 | IAssetCache assetCache, SceneManager sman, LibraryRootFolder libraryRootFolder) |
55 | : base(serversInfo, httpServer, assetCache, false, libraryRootFolder) | 55 | : base(serversInfo, httpServer, assetCache, false, libraryRootFolder) |
56 | { | 56 | { |
57 | 57 | ||
diff --git a/OpenSim/Region/Communications/Hypergrid/HGCommunicationsStandalone.cs b/OpenSim/Region/Communications/Hypergrid/HGCommunicationsStandalone.cs index 804640e..39e13d1 100644 --- a/OpenSim/Region/Communications/Hypergrid/HGCommunicationsStandalone.cs +++ b/OpenSim/Region/Communications/Hypergrid/HGCommunicationsStandalone.cs | |||
@@ -40,7 +40,7 @@ namespace OpenSim.Region.Communications.Hypergrid | |||
40 | public HGCommunicationsStandalone( | 40 | public HGCommunicationsStandalone( |
41 | NetworkServersInfo serversInfo, | 41 | NetworkServersInfo serversInfo, |
42 | BaseHttpServer httpServer, | 42 | BaseHttpServer httpServer, |
43 | AssetCache assetCache, | 43 | IAssetCache assetCache, |
44 | IUserService userService, | 44 | IUserService userService, |
45 | IUserAdminService userServiceAdmin, | 45 | IUserAdminService userServiceAdmin, |
46 | LocalInventoryService inventoryService, | 46 | LocalInventoryService inventoryService, |
diff --git a/OpenSim/Region/Communications/Hypergrid/HGGridServices.cs b/OpenSim/Region/Communications/Hypergrid/HGGridServices.cs index 2ca956b..9b11a2c 100644 --- a/OpenSim/Region/Communications/Hypergrid/HGGridServices.cs +++ b/OpenSim/Region/Communications/Hypergrid/HGGridServices.cs | |||
@@ -83,7 +83,7 @@ namespace OpenSim.Region.Communications.Hypergrid | |||
83 | // This is key-ed on agent ID | 83 | // This is key-ed on agent ID |
84 | protected Dictionary<UUID, RegionInfo> m_knownRegions = new Dictionary<UUID, RegionInfo>(); | 84 | protected Dictionary<UUID, RegionInfo> m_knownRegions = new Dictionary<UUID, RegionInfo>(); |
85 | 85 | ||
86 | protected AssetCache m_assetcache; | 86 | protected IAssetCache m_assetcache; |
87 | protected UserProfileCacheService m_userProfileCache; | 87 | protected UserProfileCacheService m_userProfileCache; |
88 | protected SceneManager m_sceneman; | 88 | protected SceneManager m_sceneman; |
89 | 89 | ||
@@ -120,7 +120,7 @@ namespace OpenSim.Region.Communications.Hypergrid | |||
120 | /// </summary> | 120 | /// </summary> |
121 | /// <param name="servers_info"></param> | 121 | /// <param name="servers_info"></param> |
122 | /// <param name="httpServe"></param> | 122 | /// <param name="httpServe"></param> |
123 | public HGGridServices(NetworkServersInfo servers_info, BaseHttpServer httpServe, AssetCache asscache, SceneManager sman) | 123 | public HGGridServices(NetworkServersInfo servers_info, BaseHttpServer httpServe, IAssetCache asscache, SceneManager sman) |
124 | { | 124 | { |
125 | serversInfo = servers_info; | 125 | serversInfo = servers_info; |
126 | httpServer = httpServe; | 126 | httpServer = httpServe; |
diff --git a/OpenSim/Region/Communications/Hypergrid/HGGridServicesGridMode.cs b/OpenSim/Region/Communications/Hypergrid/HGGridServicesGridMode.cs index b1f9f63..d1f416d 100644 --- a/OpenSim/Region/Communications/Hypergrid/HGGridServicesGridMode.cs +++ b/OpenSim/Region/Communications/Hypergrid/HGGridServicesGridMode.cs | |||
@@ -71,7 +71,7 @@ namespace OpenSim.Region.Communications.Hypergrid | |||
71 | } | 71 | } |
72 | 72 | ||
73 | public HGGridServicesGridMode(NetworkServersInfo servers_info, BaseHttpServer httpServe, | 73 | public HGGridServicesGridMode(NetworkServersInfo servers_info, BaseHttpServer httpServe, |
74 | AssetCache asscache, SceneManager sman, UserProfileCacheService userv) | 74 | IAssetCache asscache, SceneManager sman, UserProfileCacheService userv) |
75 | : base(servers_info, httpServe, asscache, sman) | 75 | : base(servers_info, httpServe, asscache, sman) |
76 | { | 76 | { |
77 | m_remoteBackend = new OGS1GridServices(servers_info, httpServe); | 77 | m_remoteBackend = new OGS1GridServices(servers_info, httpServe); |
diff --git a/OpenSim/Region/Communications/Hypergrid/HGGridServicesStandalone.cs b/OpenSim/Region/Communications/Hypergrid/HGGridServicesStandalone.cs index 27a7a0e..a2453db 100644 --- a/OpenSim/Region/Communications/Hypergrid/HGGridServicesStandalone.cs +++ b/OpenSim/Region/Communications/Hypergrid/HGGridServicesStandalone.cs | |||
@@ -79,7 +79,7 @@ namespace OpenSim.Region.Communications.Hypergrid | |||
79 | } | 79 | } |
80 | 80 | ||
81 | 81 | ||
82 | public HGGridServicesStandalone(NetworkServersInfo servers_info, BaseHttpServer httpServe, AssetCache asscache, SceneManager sman) | 82 | public HGGridServicesStandalone(NetworkServersInfo servers_info, BaseHttpServer httpServe, IAssetCache asscache, SceneManager sman) |
83 | : base(servers_info, httpServe, asscache, sman) | 83 | : base(servers_info, httpServe, asscache, sman) |
84 | { | 84 | { |
85 | //Respond to Grid Services requests | 85 | //Respond to Grid Services requests |
diff --git a/OpenSim/Region/Communications/Local/CommunicationsLocal.cs b/OpenSim/Region/Communications/Local/CommunicationsLocal.cs index 6489408..3a5c33e 100644 --- a/OpenSim/Region/Communications/Local/CommunicationsLocal.cs +++ b/OpenSim/Region/Communications/Local/CommunicationsLocal.cs | |||
@@ -37,7 +37,7 @@ namespace OpenSim.Region.Communications.Local | |||
37 | public CommunicationsLocal( | 37 | public CommunicationsLocal( |
38 | NetworkServersInfo serversInfo, | 38 | NetworkServersInfo serversInfo, |
39 | BaseHttpServer httpServer, | 39 | BaseHttpServer httpServer, |
40 | AssetCache assetCache, | 40 | IAssetCache assetCache, |
41 | IUserService userService, | 41 | IUserService userService, |
42 | IUserAdminService userServiceAdmin, | 42 | IUserAdminService userServiceAdmin, |
43 | LocalInventoryService inventoryService, | 43 | LocalInventoryService inventoryService, |
diff --git a/OpenSim/Region/Communications/OGS1/CommunicationsOGS1.cs b/OpenSim/Region/Communications/OGS1/CommunicationsOGS1.cs index 7f6fbc8..c506dd0 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 CommunicationsOGS1( | 37 | public CommunicationsOGS1( |
38 | NetworkServersInfo serversInfo, BaseHttpServer httpServer, | 38 | NetworkServersInfo serversInfo, BaseHttpServer httpServer, |
39 | AssetCache assetCache, LibraryRootFolder libraryRootFolder) | 39 | IAssetCache assetCache, LibraryRootFolder libraryRootFolder) |
40 | : base(serversInfo, httpServer, assetCache, false, libraryRootFolder) | 40 | : base(serversInfo, httpServer, assetCache, false, libraryRootFolder) |
41 | { | 41 | { |
42 | OGS1GridServices gridInterComms = new OGS1GridServices(serversInfo, httpServer); | 42 | OGS1GridServices gridInterComms = new OGS1GridServices(serversInfo, httpServer); |