aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Services/LLLoginService/LLLoginService.cs
diff options
context:
space:
mode:
Diffstat (limited to '')
-rw-r--r--OpenSim/Services/LLLoginService/LLLoginService.cs11
1 files changed, 7 insertions, 4 deletions
diff --git a/OpenSim/Services/LLLoginService/LLLoginService.cs b/OpenSim/Services/LLLoginService/LLLoginService.cs
index 638fa9f..2ae552f 100644
--- a/OpenSim/Services/LLLoginService/LLLoginService.cs
+++ b/OpenSim/Services/LLLoginService/LLLoginService.cs
@@ -26,11 +26,11 @@ namespace OpenSim.Services.LLLoginService
26 private IGridService m_GridService; 26 private IGridService m_GridService;
27 private IPresenceService m_PresenceService; 27 private IPresenceService m_PresenceService;
28 private ISimulationService m_LocalSimulationService; 28 private ISimulationService m_LocalSimulationService;
29 private ISimulationService m_RemoteSimulationService;
29 private ILibraryService m_LibraryService; 30 private ILibraryService m_LibraryService;
30 private IAvatarService m_AvatarService; 31 private IAvatarService m_AvatarService;
31 32
32 private string m_DefaultRegionName; 33 private string m_DefaultRegionName;
33 private string m_RemoteSimulationDll;
34 private string m_WelcomeMessage; 34 private string m_WelcomeMessage;
35 private bool m_RequireInventory; 35 private bool m_RequireInventory;
36 36
@@ -47,9 +47,9 @@ namespace OpenSim.Services.LLLoginService
47 string presenceService = serverConfig.GetString("PresenceService", String.Empty); 47 string presenceService = serverConfig.GetString("PresenceService", String.Empty);
48 string libService = serverConfig.GetString("LibraryService", String.Empty); 48 string libService = serverConfig.GetString("LibraryService", String.Empty);
49 string avatarService = serverConfig.GetString("AvatarService", String.Empty); 49 string avatarService = serverConfig.GetString("AvatarService", String.Empty);
50 string simulationService = serverConfig.GetString("SimulationService", String.Empty);
50 51
51 m_DefaultRegionName = serverConfig.GetString("DefaultRegion", String.Empty); 52 m_DefaultRegionName = serverConfig.GetString("DefaultRegion", String.Empty);
52 m_RemoteSimulationDll = serverConfig.GetString("RemoteSimulationService", String.Empty);
53 m_WelcomeMessage = serverConfig.GetString("WelcomeMessage", "Welcome to OpenSim!"); 53 m_WelcomeMessage = serverConfig.GetString("WelcomeMessage", "Welcome to OpenSim!");
54 m_RequireInventory = serverConfig.GetBoolean("RequireInventory", true); 54 m_RequireInventory = serverConfig.GetBoolean("RequireInventory", true);
55 55
@@ -67,6 +67,8 @@ namespace OpenSim.Services.LLLoginService
67 m_PresenceService = ServerUtils.LoadPlugin<IPresenceService>(presenceService, args); 67 m_PresenceService = ServerUtils.LoadPlugin<IPresenceService>(presenceService, args);
68 if (avatarService != string.Empty) 68 if (avatarService != string.Empty)
69 m_AvatarService = ServerUtils.LoadPlugin<IAvatarService>(avatarService, args); 69 m_AvatarService = ServerUtils.LoadPlugin<IAvatarService>(avatarService, args);
70 if (simulationService != string.Empty)
71 m_RemoteSimulationService = ServerUtils.LoadPlugin<ISimulationService>(simulationService, args);
70 // 72 //
71 // deal with the services given as argument 73 // deal with the services given as argument
72 // 74 //
@@ -184,8 +186,8 @@ namespace OpenSim.Services.LLLoginService
184 // independent login servers have just a remoteSimulationDll 186 // independent login servers have just a remoteSimulationDll
185 if (!startLocation.Contains("@") && (m_LocalSimulationService != null)) 187 if (!startLocation.Contains("@") && (m_LocalSimulationService != null))
186 simConnector = m_LocalSimulationService; 188 simConnector = m_LocalSimulationService;
187 else if (m_RemoteSimulationDll != string.Empty) 189 else if (m_RemoteSimulationService != null)
188 simConnector = ServerUtils.LoadPlugin<ISimulationService>(m_RemoteSimulationDll, args); 190 simConnector = m_RemoteSimulationService;
189 if (simConnector != null) 191 if (simConnector != null)
190 { 192 {
191 circuitCode = (uint)Util.RandomClass.Next(); ; 193 circuitCode = (uint)Util.RandomClass.Next(); ;
@@ -362,6 +364,7 @@ namespace OpenSim.Services.LLLoginService
362 //aCircuit.BaseFolder = irrelevant 364 //aCircuit.BaseFolder = irrelevant
363 aCircuit.CapsPath = CapsUtil.GetRandomCapsObjectPath(); 365 aCircuit.CapsPath = CapsUtil.GetRandomCapsObjectPath();
364 aCircuit.child = false; // the first login agent is root 366 aCircuit.child = false; // the first login agent is root
367 aCircuit.ChildrenCapSeeds = new Dictionary<ulong, string>();
365 aCircuit.circuitcode = circuit; 368 aCircuit.circuitcode = circuit;
366 aCircuit.firstname = account.FirstName; 369 aCircuit.firstname = account.FirstName;
367 //aCircuit.InventoryFolder = irrelevant 370 //aCircuit.InventoryFolder = irrelevant