aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Region/Environment/Scenes/ScenePresence.cs
diff options
context:
space:
mode:
authorlbsa712007-07-03 14:37:29 +0000
committerlbsa712007-07-03 14:37:29 +0000
commit9b6b6d05d45cf0f754a0b26bf6240ef50be66563 (patch)
tree8d72120aac2184c5ed4c5ab5f6b673ef496a0803 /OpenSim/Region/Environment/Scenes/ScenePresence.cs
parent* Completed conceptual LlsdMethod - everything resides in SimpleApp pending g... (diff)
downloadopensim-SC_OLD-9b6b6d05d45cf0f754a0b26bf6240ef50be66563.zip
opensim-SC_OLD-9b6b6d05d45cf0f754a0b26bf6240ef50be66563.tar.gz
opensim-SC_OLD-9b6b6d05d45cf0f754a0b26bf6240ef50be66563.tar.bz2
opensim-SC_OLD-9b6b6d05d45cf0f754a0b26bf6240ef50be66563.tar.xz
* Optimized usings (the 'LL ate my scripts' commit)
* added some licensing info
Diffstat (limited to 'OpenSim/Region/Environment/Scenes/ScenePresence.cs')
-rw-r--r--OpenSim/Region/Environment/Scenes/ScenePresence.cs17
1 files changed, 8 insertions, 9 deletions
diff --git a/OpenSim/Region/Environment/Scenes/ScenePresence.cs b/OpenSim/Region/Environment/Scenes/ScenePresence.cs
index 8a8f5ae..dcca848 100644
--- a/OpenSim/Region/Environment/Scenes/ScenePresence.cs
+++ b/OpenSim/Region/Environment/Scenes/ScenePresence.cs
@@ -28,14 +28,13 @@
28using System; 28using System;
29using System.Collections.Generic; 29using System.Collections.Generic;
30using System.IO; 30using System.IO;
31using System.Text; 31using Axiom.MathLib;
32using libsecondlife; 32using libsecondlife;
33using libsecondlife.Packets; 33using libsecondlife.Packets;
34using OpenSim.Physics.Manager; 34using OpenSim.Framework.Console;
35using OpenSim.Framework.Inventory;
36using OpenSim.Framework.Interfaces; 35using OpenSim.Framework.Interfaces;
37using OpenSim.Framework.Types; 36using OpenSim.Framework.Types;
38using Axiom.MathLib; 37using OpenSim.Physics.Manager;
39 38
40namespace OpenSim.Region.Environment.Scenes 39namespace OpenSim.Region.Environment.Scenes
41{ 40{
@@ -53,7 +52,7 @@ namespace OpenSim.Region.Environment.Scenes
53 private byte movementflag = 0; 52 private byte movementflag = 0;
54 private List<NewForce> forcesList = new List<NewForce>(); 53 private List<NewForce> forcesList = new List<NewForce>();
55 private short _updateCount = 0; 54 private short _updateCount = 0;
56 private Axiom.MathLib.Quaternion bodyRot; 55 private Quaternion bodyRot;
57 private LLObject.TextureEntry avatarAppearanceTexture = null; 56 private LLObject.TextureEntry avatarAppearanceTexture = null;
58 private byte[] visualParams; 57 private byte[] visualParams;
59 private AvatarWearable[] Wearables; 58 private AvatarWearable[] Wearables;
@@ -110,7 +109,7 @@ namespace OpenSim.Region.Environment.Scenes
110 109
111 m_regionInfo = reginfo; 110 m_regionInfo = reginfo;
112 m_regionHandle = reginfo.RegionHandle; 111 m_regionHandle = reginfo.RegionHandle;
113 OpenSim.Framework.Console.MainLog.Instance.Verbose("Avatar.cs "); 112 MainLog.Instance.Verbose("Avatar.cs ");
114 ControllingClient = theClient; 113 ControllingClient = theClient;
115 this.firstname = ControllingClient.FirstName; 114 this.firstname = ControllingClient.FirstName;
116 this.lastname = ControllingClient.LastName; 115 this.lastname = ControllingClient.LastName;
@@ -240,7 +239,7 @@ namespace OpenSim.Region.Environment.Scenes
240 bool update_rotation = false; 239 bool update_rotation = false;
241 bool DCFlagKeyPressed = false; 240 bool DCFlagKeyPressed = false;
242 Vector3 agent_control_v3 = new Vector3(0, 0, 0); 241 Vector3 agent_control_v3 = new Vector3(0, 0, 0);
243 Axiom.MathLib.Quaternion q = new Axiom.MathLib.Quaternion(bodyRotation.W, bodyRotation.X, bodyRotation.Y, bodyRotation.Z); 242 Quaternion q = new Quaternion(bodyRotation.W, bodyRotation.X, bodyRotation.Y, bodyRotation.Z);
244 243
245 this.PhysActor.Flying = ((flags & (uint)MainAvatar.ControlFlags.AGENT_CONTROL_FLY) != 0); 244 this.PhysActor.Flying = ((flags & (uint)MainAvatar.ControlFlags.AGENT_CONTROL_FLY) != 0);
246 245
@@ -278,10 +277,10 @@ namespace OpenSim.Region.Environment.Scenes
278 277
279 } 278 }
280 279
281 protected void AddNewMovement(Axiom.MathLib.Vector3 vec, Axiom.MathLib.Quaternion rotation) 280 protected void AddNewMovement(Vector3 vec, Quaternion rotation)
282 { 281 {
283 NewForce newVelocity = new NewForce(); 282 NewForce newVelocity = new NewForce();
284 Axiom.MathLib.Vector3 direc = rotation * vec; 283 Vector3 direc = rotation * vec;
285 direc.Normalize(); 284 direc.Normalize();
286 285
287 direc = direc * ((0.03f) * 128f); 286 direc = direc * ((0.03f) * 128f);