diff options
Another bit of refactoring to try to make sense of OpenSim.Framework.Communications. Everything that looks like a service, with service handlers, moved to .Services -- i.e. LoginService and Response, and GridInfoService. The rest of the changes were to adapt to the new locations of those files.
Diffstat (limited to '')
-rw-r--r-- | OpenSim/Framework/Communications/Services/HGInventoryService.cs | 33 |
1 files changed, 27 insertions, 6 deletions
diff --git a/OpenSim/Framework/Communications/Services/HGInventoryService.cs b/OpenSim/Framework/Communications/Services/HGInventoryService.cs index f0b2259..33d7722 100644 --- a/OpenSim/Framework/Communications/Services/HGInventoryService.cs +++ b/OpenSim/Framework/Communications/Services/HGInventoryService.cs | |||
@@ -52,19 +52,41 @@ namespace OpenSim.Framework.Communications.Services | |||
52 | = LogManager.GetLogger(MethodBase.GetCurrentMethod().DeclaringType); | 52 | = LogManager.GetLogger(MethodBase.GetCurrentMethod().DeclaringType); |
53 | 53 | ||
54 | private InventoryServiceBase m_inventoryService; | 54 | private InventoryServiceBase m_inventoryService; |
55 | private UserManagerBase m_userService; | ||
56 | IAssetDataPlugin m_assetProvider; | ||
57 | IHttpServer httpServer; | 55 | IHttpServer httpServer; |
58 | private string m_thisInventoryUrl = "http://localhost:9000"; | 56 | private string m_thisInventoryUrl = "http://localhost:9000"; |
59 | private string m_thisHostname = "127.0.0.1"; | 57 | private string m_thisHostname = "127.0.0.1"; |
60 | private uint m_thisPort = 9000; | 58 | private uint m_thisPort = 9000; |
61 | 59 | ||
60 | // These two used for local access, standalone mode | ||
61 | private UserManagerBase m_userService = null; | ||
62 | IAssetDataPlugin m_assetProvider = null; | ||
62 | 63 | ||
63 | public HGInventoryService(InventoryServiceBase invService, IAssetDataPlugin assetService, UserManagerBase userService, IHttpServer httpserver, string url) | 64 | // These two used for remote access |
65 | string m_UserServerURL = string.Empty; | ||
66 | string m_AssetServerURL = string.Empty; | ||
67 | |||
68 | // Constructor for grid inventory server | ||
69 | public HGInventoryService(InventoryServiceBase invService, string assetServiceURL, string userServiceURL, IHttpServer httpserver, string thisurl) | ||
70 | { | ||
71 | m_UserServerURL = userServiceURL; | ||
72 | m_AssetServerURL = assetServiceURL; | ||
73 | |||
74 | Init(invService, thisurl, httpserver); | ||
75 | } | ||
76 | |||
77 | // Constructor for standalone mode | ||
78 | public HGInventoryService(InventoryServiceBase invService, IAssetDataPlugin assetService, UserManagerBase userService, IHttpServer httpserver, string thisurl) | ||
64 | { | 79 | { |
65 | m_inventoryService = invService; | ||
66 | m_userService = userService; | 80 | m_userService = userService; |
67 | m_thisInventoryUrl = url; | 81 | m_assetProvider = assetService; |
82 | |||
83 | Init(invService, thisurl, httpserver); | ||
84 | } | ||
85 | |||
86 | private void Init(InventoryServiceBase invService, string thisurl, IHttpServer httpserver) | ||
87 | { | ||
88 | m_inventoryService = invService; | ||
89 | m_thisInventoryUrl = thisurl; | ||
68 | if (!m_thisInventoryUrl.EndsWith("/")) | 90 | if (!m_thisInventoryUrl.EndsWith("/")) |
69 | m_thisInventoryUrl += "/"; | 91 | m_thisInventoryUrl += "/"; |
70 | 92 | ||
@@ -75,7 +97,6 @@ namespace OpenSim.Framework.Communications.Services | |||
75 | m_thisPort = (uint)uri.Port; | 97 | m_thisPort = (uint)uri.Port; |
76 | } | 98 | } |
77 | 99 | ||
78 | m_assetProvider = assetService; | ||
79 | httpServer = httpserver; | 100 | httpServer = httpserver; |
80 | 101 | ||
81 | AddHttpHandlers(); | 102 | AddHttpHandlers(); |