aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim
diff options
context:
space:
mode:
Diffstat (limited to 'OpenSim')
-rw-r--r--OpenSim/Region/Framework/Scenes/ScenePresence.cs17
1 files changed, 5 insertions, 12 deletions
diff --git a/OpenSim/Region/Framework/Scenes/ScenePresence.cs b/OpenSim/Region/Framework/Scenes/ScenePresence.cs
index d730bbf..86e557e 100644
--- a/OpenSim/Region/Framework/Scenes/ScenePresence.cs
+++ b/OpenSim/Region/Framework/Scenes/ScenePresence.cs
@@ -73,7 +73,7 @@ namespace OpenSim.Region.Framework.Scenes
73// { 73// {
74// m_log.Debug("[SCENE PRESENCE] Destructor called"); 74// m_log.Debug("[SCENE PRESENCE] Destructor called");
75// } 75// }
76 76
77 private static readonly ILog m_log = LogManager.GetLogger(MethodBase.GetCurrentMethod().DeclaringType); 77 private static readonly ILog m_log = LogManager.GetLogger(MethodBase.GetCurrentMethod().DeclaringType);
78 78
79 public PresenceType PresenceType { get; private set; } 79 public PresenceType PresenceType { get; private set; }
@@ -90,8 +90,6 @@ namespace OpenSim.Region.Framework.Scenes
90 /// rotation, prim cut, prim twist, prim taper, and prim shear. See mantis 90 /// rotation, prim cut, prim twist, prim taper, and prim shear. See mantis
91 /// issue #1716 91 /// issue #1716
92 /// </summary> 92 /// </summary>
93// private static readonly Vector3 SIT_TARGET_ADJUSTMENT = new Vector3(0.1f, 0.0f, 0.3f);
94 // Value revised by KF 091121 by comparison with SL.
95 public static readonly Vector3 SIT_TARGET_ADJUSTMENT = new Vector3(0.0f, 0.0f, 0.418f); 93 public static readonly Vector3 SIT_TARGET_ADJUSTMENT = new Vector3(0.0f, 0.0f, 0.418f);
96 94
97 /// <summary> 95 /// <summary>
@@ -120,7 +118,6 @@ namespace OpenSim.Region.Framework.Scenes
120 /// TODO: For some reason, we effectively have a list both here and in Appearance. Need to work out if this is 118 /// TODO: For some reason, we effectively have a list both here and in Appearance. Need to work out if this is
121 /// necessary. 119 /// necessary.
122 /// </remarks> 120 /// </remarks>
123
124 protected List<SceneObjectGroup> m_attachments = new List<SceneObjectGroup>(); 121 protected List<SceneObjectGroup> m_attachments = new List<SceneObjectGroup>();
125 122
126 public Object AttachmentsSyncLock { get; private set; } 123 public Object AttachmentsSyncLock { get; private set; }
@@ -134,11 +131,8 @@ namespace OpenSim.Region.Framework.Scenes
134 public Vector3 lastKnownAllowedPosition; 131 public Vector3 lastKnownAllowedPosition;
135 public bool sentMessageAboutRestrictedParcelFlyingDown; 132 public bool sentMessageAboutRestrictedParcelFlyingDown;
136 public Vector4 CollisionPlane = Vector4.UnitW; 133 public Vector4 CollisionPlane = Vector4.UnitW;
137 134
138 private Vector3 m_avInitialPos; // used to calculate unscripted sit rotation
139 private Vector3 m_avUnscriptedSitPos; // for non-scripted prims
140 private Vector3 m_lastPosition; 135 private Vector3 m_lastPosition;
141 private Vector3 m_lastWorldPosition;
142 private Quaternion m_lastRotation; 136 private Quaternion m_lastRotation;
143 private Vector3 m_lastVelocity; 137 private Vector3 m_lastVelocity;
144 //private int m_lastTerseSent; 138 //private int m_lastTerseSent;
@@ -149,6 +143,9 @@ namespace OpenSim.Region.Framework.Scenes
149 { 143 {
150 get { return m_userFlags; } 144 get { return m_userFlags; }
151 } 145 }
146 private bool m_flyingOld; // add for fly velocity control
147 public bool m_wasFlying; // add for fly velocity control
148
152 private TeleportFlags m_teleportFlags; 149 private TeleportFlags m_teleportFlags;
153 public TeleportFlags TeleportFlags 150 public TeleportFlags TeleportFlags
154 { 151 {
@@ -171,9 +168,6 @@ namespace OpenSim.Region.Framework.Scenes
171 private Vector3 m_lastChildAgentUpdatePosition; 168 private Vector3 m_lastChildAgentUpdatePosition;
172 private Vector3 m_lastChildAgentUpdateCamPosition; 169 private Vector3 m_lastChildAgentUpdateCamPosition;
173 170
174 private bool m_flyingOld; // add for fly velocity control
175 public bool m_wasFlying; // add for fly velocity control
176
177 private const int LAND_VELOCITYMAG_MAX = 12; 171 private const int LAND_VELOCITYMAG_MAX = 12;
178 172
179 public bool IsRestrictedToRegion; 173 public bool IsRestrictedToRegion;
@@ -199,7 +193,6 @@ namespace OpenSim.Region.Framework.Scenes
199 private bool m_autopilotMoving; 193 private bool m_autopilotMoving;
200 private Vector3 m_autoPilotTarget; 194 private Vector3 m_autoPilotTarget;
201 private bool m_sitAtAutoTarget; 195 private bool m_sitAtAutoTarget;
202 private Vector3 m_initialSitTarget = Vector3.Zero; //KF: First estimate of where to sit
203 196
204 private string m_nextSitAnimation = String.Empty; 197 private string m_nextSitAnimation = String.Empty;
205 198