a couple of changes/fixes
parent
e556e22191
commit
ed899c30f6
|
@ -42,8 +42,7 @@ namespace OpenSim.world
|
|||
/// </summary>
|
||||
public void SendInitialPosition()
|
||||
{
|
||||
Console.WriteLine("sending initial Avatar data");
|
||||
this.ControllingClient.SendAvatarData(m_regInfo, this.firstname, this.lastname, this.uuid, this.localid, new LLVector3(128, 128, 60));
|
||||
this.ControllingClient.SendAvatarData(m_regionInfo, this.firstname, this.lastname, this.uuid, this.localid, new LLVector3(128, 128, 60));
|
||||
}
|
||||
|
||||
/// <summary>
|
||||
|
|
|
@ -35,7 +35,7 @@ namespace OpenSim.world
|
|||
private Dictionary<uint, IClientAPI> m_clientThreads;
|
||||
private bool childAvatar = false;
|
||||
|
||||
private RegionInfo m_regInfo;
|
||||
protected RegionInfo m_regionInfo;
|
||||
/// <summary>
|
||||
///
|
||||
/// </summary>
|
||||
|
@ -50,7 +50,7 @@ namespace OpenSim.world
|
|||
m_clientThreads = clientThreads;
|
||||
this.uuid = theClient.AgentId;
|
||||
|
||||
m_regInfo = reginfo;
|
||||
m_regionInfo = reginfo;
|
||||
OpenSim.Framework.Console.MainConsole.Instance.WriteLine(OpenSim.Framework.Console.LogPriority.LOW, "Avatar.cs - Loading details from grid (DUMMY)");
|
||||
ControllingClient = theClient;
|
||||
this.firstname = ControllingClient.FirstName;
|
||||
|
@ -144,7 +144,7 @@ namespace OpenSim.world
|
|||
/// </summary>
|
||||
public void CompleteMovement()
|
||||
{
|
||||
this.ControllingClient.MoveAgentIntoRegion(m_regInfo);
|
||||
this.ControllingClient.MoveAgentIntoRegion(m_regionInfo);
|
||||
}
|
||||
|
||||
/// <summary>
|
||||
|
|
|
@ -103,12 +103,13 @@ namespace OpenSim
|
|||
this.SetupLocalGridServers();
|
||||
this.checkServer = new CheckSumServer(12036);
|
||||
this.checkServer.ServerListener();
|
||||
this.commsManager = new RegionServerCommsOGS();
|
||||
this.commsManager = new RegionServerCommsLocal();
|
||||
new RegionServerCommsOGS();
|
||||
}
|
||||
else
|
||||
{
|
||||
this.SetupRemoteGridServers();
|
||||
this.commsManager = new RegionServerCommsLocal();
|
||||
this.commsManager = new RegionServerCommsOGS();
|
||||
}
|
||||
|
||||
startuptime = DateTime.Now;
|
||||
|
|
Loading…
Reference in New Issue