aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Region/Application
diff options
context:
space:
mode:
authorlbsa712007-10-02 00:00:12 +0000
committerlbsa712007-10-02 00:00:12 +0000
commitb5eaea7b0c627c55544f4099b50e9ac1a504fe17 (patch)
tree5104246df864943f368d5a4ddc88d5101c3155b8 /OpenSim/Region/Application
parentremoved debug statements (diff)
downloadopensim-SC_OLD-b5eaea7b0c627c55544f4099b50e9ac1a504fe17.zip
opensim-SC_OLD-b5eaea7b0c627c55544f4099b50e9ac1a504fe17.tar.gz
opensim-SC_OLD-b5eaea7b0c627c55544f4099b50e9ac1a504fe17.tar.bz2
opensim-SC_OLD-b5eaea7b0c627c55544f4099b50e9ac1a504fe17.tar.xz
* Moved setup of LocalInventoryService and LocalUserServices to the app layer
* Killed off 'parent' relation from LocalUserServices to CommunicationsLocal * Deleted obsolete project InventoryServiceBase * Deleted superfluous createCol function
Diffstat (limited to 'OpenSim/Region/Application')
-rw-r--r--OpenSim/Region/Application/OpenSimMain.cs9
1 files changed, 7 insertions, 2 deletions
diff --git a/OpenSim/Region/Application/OpenSimMain.cs b/OpenSim/Region/Application/OpenSimMain.cs
index dad6afd..e0ea212 100644
--- a/OpenSim/Region/Application/OpenSimMain.cs
+++ b/OpenSim/Region/Application/OpenSimMain.cs
@@ -157,8 +157,13 @@ namespace OpenSim
157 157
158 if (m_sandbox) 158 if (m_sandbox)
159 { 159 {
160 CommunicationsLocal.LocalSettings settings = new CommunicationsLocal.LocalSettings(standaloneWelcomeMessage, standaloneAuthenticate, standaloneInventoryPlugin, standaloneUserPlugin); 160 CommunicationsLocal.LocalSettings settings = new CommunicationsLocal.LocalSettings(standaloneWelcomeMessage, standaloneAuthenticate, standaloneInventoryPlugin);
161 CommunicationsLocal localComms = new CommunicationsLocal(m_networkServersInfo, m_httpServer, m_assetCache, settings); 161
162 LocalInventoryService inventoryService = new LocalInventoryService();
163 LocalUserServices userService = new LocalUserServices(m_networkServersInfo, m_networkServersInfo.DefaultHomeLocX, m_networkServersInfo.DefaultHomeLocY, inventoryService );
164 userService.AddPlugin( standaloneUserPlugin );
165
166 CommunicationsLocal localComms = new CommunicationsLocal(m_networkServersInfo, m_httpServer, m_assetCache, settings, userService);
162 m_commsManager = localComms; 167 m_commsManager = localComms;
163 if (standaloneAuthenticate) 168 if (standaloneAuthenticate)
164 { 169 {