OpenSim
/
OpenSimMirror
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

a couple of changes/fixes

Sugilite
MW 2007-06-09 22:06:39 +00:00
parent e556e22191
commit ed899c30f6
3 changed files with 7 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
OpenSim/OpenSim.World/Avatar.Update.cs
View File

@ -42,8 +42,7 @@ namespace OpenSim.world
/// </summary> /// </summary>
public void SendInitialPosition() public void SendInitialPosition()
{ {
Console.WriteLine("sending initial Avatar data"); this.ControllingClient.SendAvatarData(m_regionInfo, this.firstname, this.lastname, this.uuid, this.localid, new LLVector3(128, 128, 60));
this.ControllingClient.SendAvatarData(m_regInfo, this.firstname, this.lastname, this.uuid, this.localid, new LLVector3(128, 128, 60));
} }
/// <summary> /// <summary>

6
OpenSim/OpenSim.World/Avatar.cs
View File

@ -35,7 +35,7 @@ namespace OpenSim.world
private Dictionary<uint, IClientAPI> m_clientThreads; private Dictionary<uint, IClientAPI> m_clientThreads;
private bool childAvatar = false; private bool childAvatar = false;
private RegionInfo m_regInfo; protected RegionInfo m_regionInfo;
/// <summary> /// <summary>
/// ///
/// </summary> /// </summary>
@ -50,7 +50,7 @@ namespace OpenSim.world
m_clientThreads = clientThreads; m_clientThreads = clientThreads;
this.uuid = theClient.AgentId; 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)"); OpenSim.Framework.Console.MainConsole.Instance.WriteLine(OpenSim.Framework.Console.LogPriority.LOW, "Avatar.cs - Loading details from grid (DUMMY)");
ControllingClient = theClient; ControllingClient = theClient;
this.firstname = ControllingClient.FirstName; this.firstname = ControllingClient.FirstName;
@ -144,7 +144,7 @@ namespace OpenSim.world
/// </summary> /// </summary>
public void CompleteMovement() public void CompleteMovement()
{ {
this.ControllingClient.MoveAgentIntoRegion(m_regInfo); this.ControllingClient.MoveAgentIntoRegion(m_regionInfo);
} }
/// <summary> /// <summary>

5
OpenSim/OpenSim/OpenSimMain.cs
View File

@ -103,12 +103,13 @@ namespace OpenSim
this.SetupLocalGridServers(); this.SetupLocalGridServers();
this.checkServer = new CheckSumServer(12036); this.checkServer = new CheckSumServer(12036);
this.checkServer.ServerListener(); this.checkServer.ServerListener();
this.commsManager = new RegionServerCommsOGS(); this.commsManager = new RegionServerCommsLocal();
new RegionServerCommsOGS();
} }
else else
{ {
this.SetupRemoteGridServers(); this.SetupRemoteGridServers();
this.commsManager = new RegionServerCommsLocal(); this.commsManager = new RegionServerCommsOGS();
} }
startuptime = DateTime.Now; startuptime = DateTime.Now;