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

We have successful login!

merge
MW 2007-05-30 18:52:38 +00:00
parent 6e1be39315
commit 52faae69d5
5 changed files with 12 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
OpenSim/OpenSim.RegionServer/ClientView.PacketHandlers.cs
View File

@ -50,7 +50,7 @@ namespace OpenSim
this.m_inventoryCache.ClientLeaving(this.AgentID, null);
m_gridServer.LogoutSession(this.SessionID, this.AgentID, this.CircuitCode);
// m_gridServer.LogoutSession(this.SessionID, this.AgentID, this.CircuitCode);
/*lock (m_world.Entities)
{
m_world.Entities.Remove(this.AgentID);

5
OpenSim/OpenSim.RegionServer/ClientView.ProcessPackets.cs
View File

@ -38,10 +38,7 @@ namespace OpenSim
else
{
System.Text.Encoding _enc = System.Text.Encoding.ASCII;
if (Pack.Type != PacketType.PacketAck)
{
Console.WriteLine(Pack.Type.ToString());
}
switch (Pack.Type)
{
case PacketType.ViewerEffect:

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

@ -28,6 +28,7 @@ namespace OpenSim.world
public void SendInitialPosition()
{
Console.WriteLine("sending initial Avatar data");
this.ControllingClient.SendAvatarData(this.regionData, this.firstname, this.lastname, this.uuid, this.localid, new LLVector3(128, 128, 100));
}

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

@ -32,30 +32,30 @@ namespace OpenSim.world
private AvatarWearable[] Wearables;
private LLVector3 positionLastFrame = new LLVector3(0, 0, 0);
private ulong m_regionHandle;
//private Dictionary<uint, ClientView> m_clientThreads;
private Dictionary<uint, IClientAPI> m_clientThreads;
private string m_regionName;
private ushort m_regionWaterHeight;
private bool m_regionTerraform;
private bool childAvatar = false;
private RegionInfo regionData;
public Avatar(IClientAPI TheClient, World world, Dictionary<uint, IClientAPI> clientThreads, RegionInfo regionDat)
public Avatar(IClientAPI theClient, World world, Dictionary<uint, IClientAPI> clientThreads, RegionInfo regionDat)
{
Console.WriteLine("avatar point 1");
m_world = world;
// m_clientThreads = clientThreads;
m_clientThreads = clientThreads;
regionData = regionDat;
this.uuid = theClient.AgentId;
m_regionName = regionData.RegionName;
m_regionHandle = regionData.RegionHandle;
m_regionTerraform = regionData.RegionTerraform;
m_regionWaterHeight = regionData.RegionWaterHeight;
Console.WriteLine("avatar point 2");
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.lastname = ControllingClient.LastName;
localid = 8880000 + (this.m_world._localNumber++);
Pos = ControllingClient.StartPos;
Console.WriteLine("avatar point 3");
visualParams = new byte[218];
for (int i = 0; i < 218; i++)
{
@ -136,6 +136,7 @@ namespace OpenSim.world
//really really should be moved somewhere else (RegionInfo.cs ?)
public void SendRegionHandshake()
{
Console.WriteLine("sending handshake");
this.ControllingClient.SendRegionHandshake(this.regionData);
}

1
OpenSim/OpenSim/OpenSimMain.cs
View File

@ -93,6 +93,7 @@ namespace OpenSim
this.serversData.InitConfig(this.m_sandbox, this.localConfig);
this.localConfig.Close();//for now we can close it as no other classes read from it , but this should change
ClientView.TerrainManager = new TerrainManager(new SecondLife());
if (m_sandbox)
{
this.SetupLocalGridServers();