aboutsummaryrefslogtreecommitdiffstatshomepage
diff options
context:
space:
mode:
authorMW2007-05-29 18:07:17 +0000
committerMW2007-05-29 18:07:17 +0000
commitb2f16fd4e1f95ba4c4f95cbbd43088943eaa125f (patch)
treedc5f8fc7aac3378cba174af90b973c514bdcc909
parent(no commit message) (diff)
downloadopensim-SC_OLD-b2f16fd4e1f95ba4c4f95cbbd43088943eaa125f.zip
opensim-SC_OLD-b2f16fd4e1f95ba4c4f95cbbd43088943eaa125f.tar.gz
opensim-SC_OLD-b2f16fd4e1f95ba4c4f95cbbd43088943eaa125f.tar.bz2
opensim-SC_OLD-b2f16fd4e1f95ba4c4f95cbbd43088943eaa125f.tar.xz
Now We need to test to see if we can login
-rw-r--r--Common/OpenSim.Framework/Interfaces/IClientAPI.cs10
-rw-r--r--OpenSim/OpenSim.RegionServer/ClientView.API.cs17
-rw-r--r--OpenSim/OpenSim.RegionServer/ClientView.cs8
-rw-r--r--OpenSim/OpenSim.World/Avatar.Update.cs4
-rw-r--r--OpenSim/OpenSim.World/Avatar.cs6
5 files changed, 37 insertions, 8 deletions
diff --git a/Common/OpenSim.Framework/Interfaces/IClientAPI.cs b/Common/OpenSim.Framework/Interfaces/IClientAPI.cs
index 06b3075..5c5cda4 100644
--- a/Common/OpenSim.Framework/Interfaces/IClientAPI.cs
+++ b/Common/OpenSim.Framework/Interfaces/IClientAPI.cs
@@ -67,6 +67,16 @@ namespace OpenSim.Framework.Interfaces
67 get; 67 get;
68 } 68 }
69 69
70 string FirstName
71 {
72 get;
73 }
74
75 string LastName
76 {
77 get;
78 }
79
70 void OutPacket(Packet newPack); 80 void OutPacket(Packet newPack);
71 void SendWearables(AvatarWearable[] wearables); 81 void SendWearables(AvatarWearable[] wearables);
72 void SendChatMessage(byte[] message, byte type, LLVector3 fromPos, string fromName, LLUUID fromAgentID); 82 void SendChatMessage(byte[] message, byte type, LLVector3 fromPos, string fromName, LLUUID fromAgentID);
diff --git a/OpenSim/OpenSim.RegionServer/ClientView.API.cs b/OpenSim/OpenSim.RegionServer/ClientView.API.cs
index 4177dff..e7db495 100644
--- a/OpenSim/OpenSim.RegionServer/ClientView.API.cs
+++ b/OpenSim/OpenSim.RegionServer/ClientView.API.cs
@@ -56,6 +56,23 @@ namespace OpenSim
56 } 56 }
57 } 57 }
58 58
59 public string FirstName
60 {
61 get
62 {
63 return this.firstName;
64 }
65
66 }
67
68 public string LastName
69 {
70 get
71 {
72 return this.lastName;
73 }
74 }
75
59 #region World/Avatar to Client 76 #region World/Avatar to Client
60 77
61 public void MoveAgentIntoRegion(RegionInfo regInfo) 78 public void MoveAgentIntoRegion(RegionInfo regInfo)
diff --git a/OpenSim/OpenSim.RegionServer/ClientView.cs b/OpenSim/OpenSim.RegionServer/ClientView.cs
index 4d1634c..6963a0b 100644
--- a/OpenSim/OpenSim.RegionServer/ClientView.cs
+++ b/OpenSim/OpenSim.RegionServer/ClientView.cs
@@ -60,8 +60,8 @@ namespace OpenSim
60 public LLUUID AgentID; 60 public LLUUID AgentID;
61 public LLUUID SessionID; 61 public LLUUID SessionID;
62 public LLUUID SecureSessionID = LLUUID.Zero; 62 public LLUUID SecureSessionID = LLUUID.Zero;
63 public string FirstName; 63 public string firstName;
64 public string LastName; 64 public string lastName;
65 public bool m_child = false; 65 public bool m_child = false;
66 private UseCircuitCodePacket cirpack; 66 private UseCircuitCodePacket cirpack;
67 public Thread ClientThread; 67 public Thread ClientThread;
@@ -250,8 +250,8 @@ namespace OpenSim
250 this.AgentID = cirpack.CircuitCode.ID; 250 this.AgentID = cirpack.CircuitCode.ID;
251 this.SessionID = cirpack.CircuitCode.SessionID; 251 this.SessionID = cirpack.CircuitCode.SessionID;
252 this.CircuitCode = cirpack.CircuitCode.Code; 252 this.CircuitCode = cirpack.CircuitCode.Code;
253 this.FirstName = sessionInfo.LoginInfo.First; 253 this.firstName = sessionInfo.LoginInfo.First;
254 this.LastName = sessionInfo.LoginInfo.Last; 254 this.lastName = sessionInfo.LoginInfo.Last;
255 255
256 if (sessionInfo.LoginInfo.SecureSession != LLUUID.Zero) 256 if (sessionInfo.LoginInfo.SecureSession != LLUUID.Zero)
257 { 257 {
diff --git a/OpenSim/OpenSim.World/Avatar.Update.cs b/OpenSim/OpenSim.World/Avatar.Update.cs
index 13a480a..90be4b1 100644
--- a/OpenSim/OpenSim.World/Avatar.Update.cs
+++ b/OpenSim/OpenSim.World/Avatar.Update.cs
@@ -28,7 +28,7 @@ namespace OpenSim.world
28 28
29 public void SendInitialPosition() 29 public void SendInitialPosition()
30 { 30 {
31 31 this.ControllingClient.SendAvatarData(this.regionData, this.firstname, this.lastname, this.uuid, this.localid, new LLVector3(128, 128, 100));
32 } 32 }
33 33
34 public void SendOurAppearance() 34 public void SendOurAppearance()
@@ -38,7 +38,7 @@ namespace OpenSim.world
38 38
39 public void SendOurAppearance(IClientAPI OurClient) 39 public void SendOurAppearance(IClientAPI OurClient)
40 { 40 {
41 41 this.ControllingClient.SendWearables(this.Wearables);
42 } 42 }
43 43
44 public void SendAppearanceToOtherAgent(Avatar avatarInfo) 44 public void SendAppearanceToOtherAgent(Avatar avatarInfo)
diff --git a/OpenSim/OpenSim.World/Avatar.cs b/OpenSim/OpenSim.World/Avatar.cs
index ee5aa44..5b66fce 100644
--- a/OpenSim/OpenSim.World/Avatar.cs
+++ b/OpenSim/OpenSim.World/Avatar.cs
@@ -50,6 +50,8 @@ namespace OpenSim.world
50 50
51 OpenSim.Framework.Console.MainConsole.Instance.WriteLine(OpenSim.Framework.Console.LogPriority.LOW, "Avatar.cs - Loading details from grid (DUMMY)"); 51 OpenSim.Framework.Console.MainConsole.Instance.WriteLine(OpenSim.Framework.Console.LogPriority.LOW, "Avatar.cs - Loading details from grid (DUMMY)");
52 ControllingClient = TheClient; 52 ControllingClient = TheClient;
53 this.firstname = ControllingClient.FirstName;
54 this.lastname = ControllingClient.LastName;
53 localid = 8880000 + (this.m_world._localNumber++); 55 localid = 8880000 + (this.m_world._localNumber++);
54 Pos = ControllingClient.StartPos; 56 Pos = ControllingClient.StartPos;
55 visualParams = new byte[218]; 57 visualParams = new byte[218];
@@ -67,10 +69,10 @@ namespace OpenSim.world
67 69
68 this.avatarAppearanceTexture = new LLObject.TextureEntry(new LLUUID("00000000-0000-0000-5005-000000000005")); 70 this.avatarAppearanceTexture = new LLObject.TextureEntry(new LLUUID("00000000-0000-0000-5005-000000000005"));
69 71
70 /* 72
71 //register for events 73 //register for events
72 ControllingClient.OnRequestWearables += new GenericCall(this.SendOurAppearance); 74 ControllingClient.OnRequestWearables += new GenericCall(this.SendOurAppearance);
73 ControllingClient.OnSetAppearance += new SetAppearance(this.SetAppearance);*/ 75 //ControllingClient.OnSetAppearance += new SetAppearance(this.SetAppearance);
74 ControllingClient.OnCompleteMovementToRegion += new GenericCall2(this.CompleteMovement); 76 ControllingClient.OnCompleteMovementToRegion += new GenericCall2(this.CompleteMovement);
75 ControllingClient.OnCompleteMovementToRegion += new GenericCall2(this.SendInitialPosition); 77 ControllingClient.OnCompleteMovementToRegion += new GenericCall2(this.SendInitialPosition);
76 /* ControllingClient.OnAgentUpdate += new GenericCall3(this.HandleAgentUpdate); 78 /* ControllingClient.OnAgentUpdate += new GenericCall3(this.HandleAgentUpdate);