aboutsummaryrefslogtreecommitdiffstatshomepage
diff options
context:
space:
mode:
Diffstat (limited to '')
-rw-r--r--OpenSim.RegionServer/AuthenticateSessionsBase.cs10
-rw-r--r--OpenSim.RegionServer/AuthenticateSessionsLocal.cs3
-rw-r--r--OpenSim.RegionServer/OpenSimMain.cs18
-rw-r--r--OpenSim.RegionServer/SimClient.cs2
4 files changed, 20 insertions, 13 deletions
diff --git a/OpenSim.RegionServer/AuthenticateSessionsBase.cs b/OpenSim.RegionServer/AuthenticateSessionsBase.cs
index 019fcc2..b01ab7cd 100644
--- a/OpenSim.RegionServer/AuthenticateSessionsBase.cs
+++ b/OpenSim.RegionServer/AuthenticateSessionsBase.cs
@@ -63,5 +63,15 @@ namespace OpenSim
63 this.AgentCircuits.Add(circuitCode, agentData); 63 this.AgentCircuits.Add(circuitCode, agentData);
64 } 64 }
65 } 65 }
66
67 public LLVector3 GetPosition(uint circuitCode)
68 {
69 LLVector3 vec = new LLVector3();
70 if (this.AgentCircuits.ContainsKey(circuitCode))
71 {
72 vec = this.AgentCircuits[circuitCode].startpos;
73 }
74 return vec;
75 }
66 } 76 }
67} 77}
diff --git a/OpenSim.RegionServer/AuthenticateSessionsLocal.cs b/OpenSim.RegionServer/AuthenticateSessionsLocal.cs
index ca46355..6c1c7d2 100644
--- a/OpenSim.RegionServer/AuthenticateSessionsLocal.cs
+++ b/OpenSim.RegionServer/AuthenticateSessionsLocal.cs
@@ -1,6 +1,7 @@
1using System; 1using System;
2using System.Collections.Generic; 2using System.Collections.Generic;
3using System.Text; 3using System.Text;
4using libsecondlife;
4using OpenSim.Framework.Types; 5using OpenSim.Framework.Types;
5 6
6namespace OpenSim 7namespace OpenSim
@@ -23,7 +24,7 @@ namespace OpenSim
23 agent.circuitcode = loginData.CircuitCode; 24 agent.circuitcode = loginData.CircuitCode;
24 agent.BaseFolder = loginData.BaseFolder; 25 agent.BaseFolder = loginData.BaseFolder;
25 agent.InventoryFolder = loginData.InventoryFolder; 26 agent.InventoryFolder = loginData.InventoryFolder;
26 27 agent.startpos = new LLVector3(128,128,70);
27 this.AddNewCircuit(agent.circuitcode, agent); 28 this.AddNewCircuit(agent.circuitcode, agent);
28 } 29 }
29 } 30 }
diff --git a/OpenSim.RegionServer/OpenSimMain.cs b/OpenSim.RegionServer/OpenSimMain.cs
index 55dab3b..f78873d 100644
--- a/OpenSim.RegionServer/OpenSimMain.cs
+++ b/OpenSim.RegionServer/OpenSimMain.cs
@@ -126,10 +126,16 @@ namespace OpenSim
126 if (m_sandbox) 126 if (m_sandbox)
127 { 127 {
128 this.SetupLocalGridServers(); 128 this.SetupLocalGridServers();
129 //Authenticate Session Handler
130 AuthenticateSessionsLocal authen = new AuthenticateSessionsLocal();
131 this.AuthenticateSessionsHandler = authen;
129 } 132 }
130 else 133 else
131 { 134 {
132 this.SetupRemoteGridServers(); 135 this.SetupRemoteGridServers();
136 //Authenticate Session Handler
137 AuthenticateSessionsRemote authen = new AuthenticateSessionsRemote();
138 this.AuthenticateSessionsHandler = authen;
133 } 139 }
134 140
135 startuptime = DateTime.Now; 141 startuptime = DateTime.Now;
@@ -145,18 +151,6 @@ namespace OpenSim
145 Environment.Exit(1); 151 Environment.Exit(1);
146 } 152 }
147 153
148 //Authenticate Session Handler
149 if (m_sandbox)
150 {
151 AuthenticateSessionsLocal authen = new AuthenticateSessionsLocal();
152 this.AuthenticateSessionsHandler = authen;
153 }
154 else
155 {
156 AuthenticateSessionsRemote authen = new AuthenticateSessionsRemote();
157 this.AuthenticateSessionsHandler = authen;
158 }
159
160 m_udpServer = new UDPServer(this.regionData.IPListenPort, this.GridServers, this.AssetCache, this.InventoryCache, this.regionData, this.m_sandbox, this.user_accounts, this.m_console, this.AuthenticateSessionsHandler); 154 m_udpServer = new UDPServer(this.regionData.IPListenPort, this.GridServers, this.AssetCache, this.InventoryCache, this.regionData, this.m_sandbox, this.user_accounts, this.m_console, this.AuthenticateSessionsHandler);
161 155
162 //should be passing a IGenericConfig object to these so they can read the config data they want from it 156 //should be passing a IGenericConfig object to these so they can read the config data they want from it
diff --git a/OpenSim.RegionServer/SimClient.cs b/OpenSim.RegionServer/SimClient.cs
index 4cf2813..0f107d9 100644
--- a/OpenSim.RegionServer/SimClient.cs
+++ b/OpenSim.RegionServer/SimClient.cs
@@ -113,6 +113,8 @@ namespace OpenSim
113 OpenSim.Framework.Console.MainConsole.Instance.WriteLine(OpenSim.Framework.Console.LogPriority.LOW, "OpenSimClient.cs - Started up new client thread to handle incoming request"); 113 OpenSim.Framework.Console.MainConsole.Instance.WriteLine(OpenSim.Framework.Console.LogPriority.LOW, "OpenSimClient.cs - Started up new client thread to handle incoming request");
114 cirpack = initialcirpack; 114 cirpack = initialcirpack;
115 userEP = remoteEP; 115 userEP = remoteEP;
116
117 //currently not working due to changes in progress to the authenticating system.
116 /* if (m_gridServer.GetName() == "Remote") 118 /* if (m_gridServer.GetName() == "Remote")
117 { 119 {
118 this.startpos = ((RemoteGridBase)m_gridServer).agentcircuits[initialcirpack.CircuitCode.Code].startpos; 120 this.startpos = ((RemoteGridBase)m_gridServer).agentcircuits[initialcirpack.CircuitCode.Code].startpos;