a bit more refactoring
parent
1037a901c1
commit
5f9b7321bc
|
@ -63,5 +63,15 @@ namespace OpenSim
|
||||||
this.AgentCircuits.Add(circuitCode, agentData);
|
this.AgentCircuits.Add(circuitCode, agentData);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
public LLVector3 GetPosition(uint circuitCode)
|
||||||
|
{
|
||||||
|
LLVector3 vec = new LLVector3();
|
||||||
|
if (this.AgentCircuits.ContainsKey(circuitCode))
|
||||||
|
{
|
||||||
|
vec = this.AgentCircuits[circuitCode].startpos;
|
||||||
|
}
|
||||||
|
return vec;
|
||||||
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
|
@ -1,6 +1,7 @@
|
||||||
using System;
|
using System;
|
||||||
using System.Collections.Generic;
|
using System.Collections.Generic;
|
||||||
using System.Text;
|
using System.Text;
|
||||||
|
using libsecondlife;
|
||||||
using OpenSim.Framework.Types;
|
using OpenSim.Framework.Types;
|
||||||
|
|
||||||
namespace OpenSim
|
namespace OpenSim
|
||||||
|
@ -23,7 +24,7 @@ namespace OpenSim
|
||||||
agent.circuitcode = loginData.CircuitCode;
|
agent.circuitcode = loginData.CircuitCode;
|
||||||
agent.BaseFolder = loginData.BaseFolder;
|
agent.BaseFolder = loginData.BaseFolder;
|
||||||
agent.InventoryFolder = loginData.InventoryFolder;
|
agent.InventoryFolder = loginData.InventoryFolder;
|
||||||
|
agent.startpos = new LLVector3(128,128,70);
|
||||||
this.AddNewCircuit(agent.circuitcode, agent);
|
this.AddNewCircuit(agent.circuitcode, agent);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
|
@ -126,10 +126,16 @@ namespace OpenSim
|
||||||
if (m_sandbox)
|
if (m_sandbox)
|
||||||
{
|
{
|
||||||
this.SetupLocalGridServers();
|
this.SetupLocalGridServers();
|
||||||
|
//Authenticate Session Handler
|
||||||
|
AuthenticateSessionsLocal authen = new AuthenticateSessionsLocal();
|
||||||
|
this.AuthenticateSessionsHandler = authen;
|
||||||
}
|
}
|
||||||
else
|
else
|
||||||
{
|
{
|
||||||
this.SetupRemoteGridServers();
|
this.SetupRemoteGridServers();
|
||||||
|
//Authenticate Session Handler
|
||||||
|
AuthenticateSessionsRemote authen = new AuthenticateSessionsRemote();
|
||||||
|
this.AuthenticateSessionsHandler = authen;
|
||||||
}
|
}
|
||||||
|
|
||||||
startuptime = DateTime.Now;
|
startuptime = DateTime.Now;
|
||||||
|
@ -145,18 +151,6 @@ namespace OpenSim
|
||||||
Environment.Exit(1);
|
Environment.Exit(1);
|
||||||
}
|
}
|
||||||
|
|
||||||
//Authenticate Session Handler
|
|
||||||
if (m_sandbox)
|
|
||||||
{
|
|
||||||
AuthenticateSessionsLocal authen = new AuthenticateSessionsLocal();
|
|
||||||
this.AuthenticateSessionsHandler = authen;
|
|
||||||
}
|
|
||||||
else
|
|
||||||
{
|
|
||||||
AuthenticateSessionsRemote authen = new AuthenticateSessionsRemote();
|
|
||||||
this.AuthenticateSessionsHandler = authen;
|
|
||||||
}
|
|
||||||
|
|
||||||
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);
|
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);
|
||||||
|
|
||||||
//should be passing a IGenericConfig object to these so they can read the config data they want from it
|
//should be passing a IGenericConfig object to these so they can read the config data they want from it
|
||||||
|
|
|
@ -113,6 +113,8 @@ namespace OpenSim
|
||||||
OpenSim.Framework.Console.MainConsole.Instance.WriteLine(OpenSim.Framework.Console.LogPriority.LOW, "OpenSimClient.cs - Started up new client thread to handle incoming request");
|
OpenSim.Framework.Console.MainConsole.Instance.WriteLine(OpenSim.Framework.Console.LogPriority.LOW, "OpenSimClient.cs - Started up new client thread to handle incoming request");
|
||||||
cirpack = initialcirpack;
|
cirpack = initialcirpack;
|
||||||
userEP = remoteEP;
|
userEP = remoteEP;
|
||||||
|
|
||||||
|
//currently not working due to changes in progress to the authenticating system.
|
||||||
/* if (m_gridServer.GetName() == "Remote")
|
/* if (m_gridServer.GetName() == "Remote")
|
||||||
{
|
{
|
||||||
this.startpos = ((RemoteGridBase)m_gridServer).agentcircuits[initialcirpack.CircuitCode.Code].startpos;
|
this.startpos = ((RemoteGridBase)m_gridServer).agentcircuits[initialcirpack.CircuitCode.Code].startpos;
|
||||||
|
|
Loading…
Reference in New Issue