diff options
Diffstat (limited to 'OpenSim/OpenSim.World')
-rw-r--r-- | OpenSim/OpenSim.World/Avatar.Update.cs | 4 | ||||
-rw-r--r-- | OpenSim/OpenSim.World/Avatar.cs | 6 |
2 files changed, 6 insertions, 4 deletions
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); |