aboutsummaryrefslogtreecommitdiffstatshomepage
diff options
context:
space:
mode:
-rw-r--r--OpenSim/Region/ClientStack/ClientView.API.cs9
-rw-r--r--OpenSim/Region/Environment/Scenes/ScenePresence.cs1
-rw-r--r--OpenSim/Region/Examples/SimpleApp/MyWorld.cs18
-rw-r--r--OpenSim/Region/Examples/SimpleApp/Program.cs4
4 files changed, 5 insertions, 27 deletions
diff --git a/OpenSim/Region/ClientStack/ClientView.API.cs b/OpenSim/Region/ClientStack/ClientView.API.cs
index 98bc84d..cc4fdbe 100644
--- a/OpenSim/Region/ClientStack/ClientView.API.cs
+++ b/OpenSim/Region/ClientStack/ClientView.API.cs
@@ -648,7 +648,7 @@ namespace OpenSim.Region.ClientStack
648 #region Avatar Packet/data sending Methods 648 #region Avatar Packet/data sending Methods
649 649
650 /// <summary> 650 /// <summary>
651 /// 651 /// send a objectupdate packet with information about the clients avatar
652 /// </summary> 652 /// </summary>
653 /// <param name="regionInfo"></param> 653 /// <param name="regionInfo"></param>
654 /// <param name="firstName"></param> 654 /// <param name="firstName"></param>
@@ -658,19 +658,16 @@ namespace OpenSim.Region.ClientStack
658 /// <param name="Pos"></param> 658 /// <param name="Pos"></param>
659 public void SendAvatarData(ulong regionHandle, string firstName, string lastName, LLUUID avatarID, uint avatarLocalID, LLVector3 Pos, byte[] textureEntry) 659 public void SendAvatarData(ulong regionHandle, string firstName, string lastName, LLUUID avatarID, uint avatarLocalID, LLVector3 Pos, byte[] textureEntry)
660 { 660 {
661 Encoding _enc = Encoding.ASCII;
662 //send a objectupdate packet with information about the clients avatar
663
664 ObjectUpdatePacket objupdate = new ObjectUpdatePacket(); 661 ObjectUpdatePacket objupdate = new ObjectUpdatePacket();
665 objupdate.RegionData.RegionHandle = regionHandle; 662 objupdate.RegionData.RegionHandle = regionHandle;
666 objupdate.RegionData.TimeDilation = 64096; 663 objupdate.RegionData.TimeDilation = 64096;
667 objupdate.ObjectData = new ObjectUpdatePacket.ObjectDataBlock[1]; 664 objupdate.ObjectData = new ObjectUpdatePacket.ObjectDataBlock[1];
668 objupdate.ObjectData[0] = this.CreateDefaultAvatarPacket(textureEntry); 665 objupdate.ObjectData[0] = this.CreateDefaultAvatarPacket(textureEntry);
669 //give this avatar object a local id and assign the user a name
670 666
667 //give this avatar object a local id and assign the user a name
671 objupdate.ObjectData[0].ID = avatarLocalID; 668 objupdate.ObjectData[0].ID = avatarLocalID;
672 objupdate.ObjectData[0].FullID = avatarID; 669 objupdate.ObjectData[0].FullID = avatarID;
673 objupdate.ObjectData[0].NameValue = _enc.GetBytes("FirstName STRING RW SV " + firstName + "\nLastName STRING RW SV " + lastName + " \0"); 670 objupdate.ObjectData[0].NameValue = Helpers.StringToField("FirstName STRING RW SV " + firstName + "\nLastName STRING RW SV " + lastName );
674 LLVector3 pos2 = new LLVector3((float)Pos.X, (float)Pos.Y, (float)Pos.Z); 671 LLVector3 pos2 = new LLVector3((float)Pos.X, (float)Pos.Y, (float)Pos.Z);
675 byte[] pb = pos2.GetBytes(); 672 byte[] pb = pos2.GetBytes();
676 Array.Copy(pb, 0, objupdate.ObjectData[0].ObjectData, 16, pb.Length); 673 Array.Copy(pb, 0, objupdate.ObjectData[0].ObjectData, 16, pb.Length);
diff --git a/OpenSim/Region/Environment/Scenes/ScenePresence.cs b/OpenSim/Region/Environment/Scenes/ScenePresence.cs
index 037b19d..a813aed 100644
--- a/OpenSim/Region/Environment/Scenes/ScenePresence.cs
+++ b/OpenSim/Region/Environment/Scenes/ScenePresence.cs
@@ -59,7 +59,6 @@ namespace OpenSim.Region.Environment.Scenes
59 private LLObject.TextureEntry avatarAppearanceTexture = null; 59 private LLObject.TextureEntry avatarAppearanceTexture = null;
60 private byte[] visualParams; 60 private byte[] visualParams;
61 private AvatarWearable[] Wearables; 61 private AvatarWearable[] Wearables;
62 private LLVector3 positionLastFrame = new LLVector3(0, 0, 0);
63 private ulong m_regionHandle; 62 private ulong m_regionHandle;
64 private bool childAgent = false; 63 private bool childAgent = false;
65 private bool newForce = false; 64 private bool newForce = false;
diff --git a/OpenSim/Region/Examples/SimpleApp/MyWorld.cs b/OpenSim/Region/Examples/SimpleApp/MyWorld.cs
index ee35b8e..39666fb 100644
--- a/OpenSim/Region/Examples/SimpleApp/MyWorld.cs
+++ b/OpenSim/Region/Examples/SimpleApp/MyWorld.cs
@@ -52,7 +52,6 @@ namespace SimpleApp
52 client.SendChatMessage("Ready.", 1, pos, "System", LLUUID.Zero ); 52 client.SendChatMessage("Ready.", 1, pos, "System", LLUUID.Zero );
53 }; 53 };
54 54
55 client.OnRequestWearables += SendWearables;
56 client.OnAddPrim += AddNewPrim; 55 client.OnAddPrim += AddNewPrim;
57 client.OnUpdatePrimGroupPosition += this.UpdatePrimPosition; 56 client.OnUpdatePrimGroupPosition += this.UpdatePrimPosition;
58 client.OnRequestMapBlocks += this.RequestMapBlocks; 57 client.OnRequestMapBlocks += this.RequestMapBlocks;
@@ -61,20 +60,8 @@ namespace SimpleApp
61 client.OnNameFromUUIDRequest += this.commsManager.HandleUUIDNameRequest; 60 client.OnNameFromUUIDRequest += this.commsManager.HandleUUIDNameRequest;
62 61
63 client.OnCompleteMovementToRegion += delegate() 62 client.OnCompleteMovementToRegion += delegate()
64 {
65 client.MoveAgentIntoRegion(m_regInfo, pos, LLVector3.Zero );
66 };
67
68 client.OnCompleteMovementToRegion += delegate()
69 { 63 {
70 client.SendAvatarData(m_regInfo.RegionHandle, client.FirstName,
71 client.LastName, client.AgentId, 0,
72 pos, null);
73
74 client.SendChatMessage("Welcome to My World.", 1, pos, "System", LLUUID.Zero ); 64 client.SendChatMessage("Welcome to My World.", 1, pos, "System", LLUUID.Zero );
75
76
77
78 }; 65 };
79 66
80 client.SendRegionHandshake(m_regInfo); 67 client.SendRegionHandshake(m_regInfo);
@@ -83,11 +70,6 @@ namespace SimpleApp
83 70
84 } 71 }
85 72
86 private void SendWearables( IClientAPI client )
87 {
88 client.SendWearables( AvatarWearable.DefaultWearables );
89 }
90
91 #endregion 73 #endregion
92 } 74 }
93} 75}
diff --git a/OpenSim/Region/Examples/SimpleApp/Program.cs b/OpenSim/Region/Examples/SimpleApp/Program.cs
index ce3c056..e5e2234 100644
--- a/OpenSim/Region/Examples/SimpleApp/Program.cs
+++ b/OpenSim/Region/Examples/SimpleApp/Program.cs
@@ -68,9 +68,9 @@ namespace SimpleApp
68 68
69 PrimitiveBaseShape shape = PrimitiveBaseShape.DefaultBox(); 69 PrimitiveBaseShape shape = PrimitiveBaseShape.DefaultBox();
70 70
71 shape.Scale = new LLVector3(1, 1, 1); 71 shape.Scale = new LLVector3(10, 10, 10);
72 72
73 LLVector3 pos = new LLVector3(1,1,1); 73 LLVector3 pos = new LLVector3(128,128,72);
74 74
75 world.AddNewPrim( LLUUID.Zero, pos, shape ); 75 world.AddNewPrim( LLUUID.Zero, pos, shape );
76 76