aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Region/Application
diff options
context:
space:
mode:
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 e0ea212..04b8dce 100644
--- a/OpenSim/Region/Application/OpenSimMain.cs
+++ b/OpenSim/Region/Application/OpenSimMain.cs
@@ -108,6 +108,7 @@ namespace OpenSim
108 } 108 }
109 109
110 ReadConfigSettings(startupSource); 110 ReadConfigSettings(startupSource);
111
111 } 112 }
112 113
113 protected void ReadConfigSettings(IConfigSource configSource) 114 protected void ReadConfigSettings(IConfigSource configSource)
@@ -145,6 +146,7 @@ namespace OpenSim
145 /// </summary> 146 /// </summary>
146 public override void StartUp() 147 public override void StartUp()
147 { 148 {
149
148 if (!Directory.Exists(Util.logDir())) 150 if (!Directory.Exists(Util.logDir()))
149 { 151 {
150 Directory.CreateDirectory(Util.logDir()); 152 Directory.CreateDirectory(Util.logDir());
@@ -157,14 +159,17 @@ namespace OpenSim
157 159
158 if (m_sandbox) 160 if (m_sandbox)
159 { 161 {
160 CommunicationsLocal.LocalSettings settings = new CommunicationsLocal.LocalSettings(standaloneWelcomeMessage, standaloneAuthenticate, standaloneInventoryPlugin); 162 CommunicationsLocal.LocalSettings settings = new CommunicationsLocal.LocalSettings(standaloneWelcomeMessage, standaloneAuthenticate);
161 163
162 LocalInventoryService inventoryService = new LocalInventoryService(); 164 LocalInventoryService inventoryService = new LocalInventoryService();
165 inventoryService.AddPlugin(standaloneInventoryPlugin);
166
163 LocalUserServices userService = new LocalUserServices(m_networkServersInfo, m_networkServersInfo.DefaultHomeLocX, m_networkServersInfo.DefaultHomeLocY, inventoryService ); 167 LocalUserServices userService = new LocalUserServices(m_networkServersInfo, m_networkServersInfo.DefaultHomeLocX, m_networkServersInfo.DefaultHomeLocY, inventoryService );
164 userService.AddPlugin( standaloneUserPlugin ); 168 userService.AddPlugin( standaloneUserPlugin );
165 169
166 CommunicationsLocal localComms = new CommunicationsLocal(m_networkServersInfo, m_httpServer, m_assetCache, settings, userService); 170 CommunicationsLocal localComms = new CommunicationsLocal(m_networkServersInfo, m_httpServer, m_assetCache, settings, userService, inventoryService);
167 m_commsManager = localComms; 171 m_commsManager = localComms;
172
168 if (standaloneAuthenticate) 173 if (standaloneAuthenticate)
169 { 174 {
170 this.CreateAccount = localComms.doCreate; 175 this.CreateAccount = localComms.doCreate;