From a076369fa3dee4c99d4b7a6c8b699710c75ebc04 Mon Sep 17 00:00:00 2001
From: lbsa71
Date: Fri, 13 Jul 2007 18:01:44 +0000
Subject: * I want to commit too!

---
 OpenSim/Region/ClientStack/ClientView.API.cs       |  9 +++------
 OpenSim/Region/Environment/Scenes/ScenePresence.cs |  1 -
 OpenSim/Region/Examples/SimpleApp/MyWorld.cs       | 18 ------------------
 OpenSim/Region/Examples/SimpleApp/Program.cs       |  4 ++--
 4 files changed, 5 insertions(+), 27 deletions(-)

(limited to 'OpenSim/Region')

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
         #region Avatar Packet/data sending Methods
 
         /// <summary>
-        /// 
+        /// send a objectupdate packet with information about the clients avatar
         /// </summary>
         /// <param name="regionInfo"></param>
         /// <param name="firstName"></param>
@@ -658,19 +658,16 @@ namespace OpenSim.Region.ClientStack
         /// <param name="Pos"></param>
         public void SendAvatarData(ulong regionHandle, string firstName, string lastName, LLUUID avatarID, uint avatarLocalID, LLVector3 Pos, byte[] textureEntry)
         {
-            Encoding _enc = Encoding.ASCII;
-            //send a objectupdate packet with information about the clients avatar
-
             ObjectUpdatePacket objupdate = new ObjectUpdatePacket();
             objupdate.RegionData.RegionHandle = regionHandle;
             objupdate.RegionData.TimeDilation = 64096;
             objupdate.ObjectData = new ObjectUpdatePacket.ObjectDataBlock[1];
             objupdate.ObjectData[0] = this.CreateDefaultAvatarPacket(textureEntry);
-            //give this avatar object a local id and assign the user a name
 
+            //give this avatar object a local id and assign the user a name
             objupdate.ObjectData[0].ID = avatarLocalID;
             objupdate.ObjectData[0].FullID = avatarID;
-            objupdate.ObjectData[0].NameValue = _enc.GetBytes("FirstName STRING RW SV " + firstName + "\nLastName STRING RW SV " + lastName + " \0");
+            objupdate.ObjectData[0].NameValue = Helpers.StringToField("FirstName STRING RW SV " + firstName + "\nLastName STRING RW SV " + lastName );
             LLVector3 pos2 = new LLVector3((float)Pos.X, (float)Pos.Y, (float)Pos.Z);
             byte[] pb = pos2.GetBytes();
             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
         private LLObject.TextureEntry avatarAppearanceTexture = null;
         private byte[] visualParams;
         private AvatarWearable[] Wearables;
-        private LLVector3 positionLastFrame = new LLVector3(0, 0, 0);
         private ulong m_regionHandle;
         private bool childAgent = false;
         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
                         client.SendChatMessage("Ready.", 1, pos, "System", LLUUID.Zero );
                     };
             
-            client.OnRequestWearables += SendWearables;
             client.OnAddPrim += AddNewPrim;
             client.OnUpdatePrimGroupPosition += this.UpdatePrimPosition;
             client.OnRequestMapBlocks += this.RequestMapBlocks;
@@ -61,20 +60,8 @@ namespace SimpleApp
             client.OnNameFromUUIDRequest += this.commsManager.HandleUUIDNameRequest;
             
             client.OnCompleteMovementToRegion += delegate()
-                {
-                    client.MoveAgentIntoRegion(m_regInfo, pos, LLVector3.Zero );
-                };
-
-            client.OnCompleteMovementToRegion += delegate()
                  {
-                     client.SendAvatarData(m_regInfo.RegionHandle, client.FirstName,
-                                           client.LastName, client.AgentId, 0,
-                                           pos, null);
-                                                         
                      client.SendChatMessage("Welcome to My World.", 1, pos, "System", LLUUID.Zero );
-
-          
-                                                         
                  };
 
             client.SendRegionHandshake(m_regInfo);
@@ -83,11 +70,6 @@ namespace SimpleApp
             
         }
 
-        private void SendWearables( IClientAPI client )
-        {
-            client.SendWearables( AvatarWearable.DefaultWearables );
-        }
-
         #endregion
     }
 }
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
 
             PrimitiveBaseShape shape = PrimitiveBaseShape.DefaultBox();
             
-            shape.Scale = new LLVector3(1, 1, 1);
+            shape.Scale = new LLVector3(10, 10, 10);
             
-            LLVector3 pos = new LLVector3(1,1,1);
+            LLVector3 pos = new LLVector3(128,128,72);
 
             world.AddNewPrim( LLUUID.Zero, pos, shape );
 
-- 
cgit v1.1