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

Now We need to test to see if we can login

merge
MW 2007-05-29 18:07:17 +00:00
parent 4d0261ed22
commit b2f16fd4e1
5 changed files with 37 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
Common/OpenSim.Framework/Interfaces/IClientAPI.cs
View File

@ -67,6 +67,16 @@ namespace OpenSim.Framework.Interfaces
get; get;
} }
string FirstName
{
get;
}
string LastName
{
get;
}
void OutPacket(Packet newPack); void OutPacket(Packet newPack);
void SendWearables(AvatarWearable[] wearables); void SendWearables(AvatarWearable[] wearables);
void SendChatMessage(byte[] message, byte type, LLVector3 fromPos, string fromName, LLUUID fromAgentID); void SendChatMessage(byte[] message, byte type, LLVector3 fromPos, string fromName, LLUUID fromAgentID);

17
OpenSim/OpenSim.RegionServer/ClientView.API.cs
View File

@ -56,6 +56,23 @@ namespace OpenSim
} }
} }
public string FirstName
{
get
{
return this.firstName;
}
}
public string LastName
{
get
{
return this.lastName;
}
}
#region World/Avatar to Client #region World/Avatar to Client
public void MoveAgentIntoRegion(RegionInfo regInfo) public void MoveAgentIntoRegion(RegionInfo regInfo)

8
OpenSim/OpenSim.RegionServer/ClientView.cs
View File

@ -60,8 +60,8 @@ namespace OpenSim
public LLUUID AgentID; public LLUUID AgentID;
public LLUUID SessionID; public LLUUID SessionID;
public LLUUID SecureSessionID = LLUUID.Zero; public LLUUID SecureSessionID = LLUUID.Zero;
public string FirstName; public string firstName;
public string LastName; public string lastName;
public bool m_child = false; public bool m_child = false;
private UseCircuitCodePacket cirpack; private UseCircuitCodePacket cirpack;
public Thread ClientThread; public Thread ClientThread;
@ -250,8 +250,8 @@ namespace OpenSim
this.AgentID = cirpack.CircuitCode.ID; this.AgentID = cirpack.CircuitCode.ID;
this.SessionID = cirpack.CircuitCode.SessionID; this.SessionID = cirpack.CircuitCode.SessionID;
this.CircuitCode = cirpack.CircuitCode.Code; this.CircuitCode = cirpack.CircuitCode.Code;
this.FirstName = sessionInfo.LoginInfo.First; this.firstName = sessionInfo.LoginInfo.First;
this.LastName = sessionInfo.LoginInfo.Last; this.lastName = sessionInfo.LoginInfo.Last;
if (sessionInfo.LoginInfo.SecureSession != LLUUID.Zero) if (sessionInfo.LoginInfo.SecureSession != LLUUID.Zero)
{ {

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

@ -28,7 +28,7 @@ namespace OpenSim.world
public void SendInitialPosition() public void SendInitialPosition()
{ {
this.ControllingClient.SendAvatarData(this.regionData, this.firstname, this.lastname, this.uuid, this.localid, new LLVector3(128, 128, 100));
} }
public void SendOurAppearance() public void SendOurAppearance()
@ -38,7 +38,7 @@ namespace OpenSim.world
public void SendOurAppearance(IClientAPI OurClient) public void SendOurAppearance(IClientAPI OurClient)
{ {
this.ControllingClient.SendWearables(this.Wearables);
} }
public void SendAppearanceToOtherAgent(Avatar avatarInfo) public void SendAppearanceToOtherAgent(Avatar avatarInfo)

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

@ -50,6 +50,8 @@ namespace OpenSim.world
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.lastname = ControllingClient.LastName;
localid = 8880000 + (this.m_world._localNumber++); localid = 8880000 + (this.m_world._localNumber++);
Pos = ControllingClient.StartPos; Pos = ControllingClient.StartPos;
visualParams = new byte[218]; visualParams = new byte[218];
@ -67,10 +69,10 @@ namespace OpenSim.world
this.avatarAppearanceTexture = new LLObject.TextureEntry(new LLUUID("00000000-0000-0000-5005-000000000005")); this.avatarAppearanceTexture = new LLObject.TextureEntry(new LLUUID("00000000-0000-0000-5005-000000000005"));
/*
//register for events //register for events
ControllingClient.OnRequestWearables += new GenericCall(this.SendOurAppearance); ControllingClient.OnRequestWearables += new GenericCall(this.SendOurAppearance);
ControllingClient.OnSetAppearance += new SetAppearance(this.SetAppearance);*/ //ControllingClient.OnSetAppearance += new SetAppearance(this.SetAppearance);
ControllingClient.OnCompleteMovementToRegion += new GenericCall2(this.CompleteMovement); ControllingClient.OnCompleteMovementToRegion += new GenericCall2(this.CompleteMovement);
ControllingClient.OnCompleteMovementToRegion += new GenericCall2(this.SendInitialPosition); ControllingClient.OnCompleteMovementToRegion += new GenericCall2(this.SendInitialPosition);
/* ControllingClient.OnAgentUpdate += new GenericCall3(this.HandleAgentUpdate); /* ControllingClient.OnAgentUpdate += new GenericCall3(this.HandleAgentUpdate);