aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Region/Framework/Scenes
diff options
context:
space:
mode:
Diffstat (limited to 'OpenSim/Region/Framework/Scenes')
-rw-r--r--OpenSim/Region/Framework/Scenes/Animation/ScenePresenceAnimator.cs244
-rw-r--r--OpenSim/Region/Framework/Scenes/AsyncSceneObjectGroupDeleter.cs7
-rw-r--r--OpenSim/Region/Framework/Scenes/EventManager.cs24
-rw-r--r--OpenSim/Region/Framework/Scenes/Prioritizer.cs4
-rw-r--r--OpenSim/Region/Framework/Scenes/Scene.Inventory.cs355
-rw-r--r--OpenSim/Region/Framework/Scenes/Scene.PacketHandlers.cs3
-rw-r--r--OpenSim/Region/Framework/Scenes/Scene.Permissions.cs17
-rw-r--r--OpenSim/Region/Framework/Scenes/Scene.cs502
-rw-r--r--OpenSim/Region/Framework/Scenes/SceneBase.cs2
-rw-r--r--OpenSim/Region/Framework/Scenes/SceneCommunicationService.cs50
-rw-r--r--OpenSim/Region/Framework/Scenes/SceneGraph.cs224
-rw-r--r--OpenSim/Region/Framework/Scenes/SceneObjectGroup.Inventory.cs7
-rw-r--r--OpenSim/Region/Framework/Scenes/SceneObjectGroup.cs569
-rw-r--r--OpenSim/Region/Framework/Scenes/SceneObjectPart.cs227
-rw-r--r--OpenSim/Region/Framework/Scenes/SceneObjectPartInventory.cs795
-rw-r--r--OpenSim/Region/Framework/Scenes/ScenePresence.cs907
-rw-r--r--OpenSim/Region/Framework/Scenes/SceneViewer.cs2
-rw-r--r--OpenSim/Region/Framework/Scenes/Serialization/SceneObjectSerializer.cs23
-rw-r--r--OpenSim/Region/Framework/Scenes/UndoState.cs87
-rw-r--r--OpenSim/Region/Framework/Scenes/UuidGatherer.cs4
20 files changed, 3024 insertions, 1029 deletions
diff --git a/OpenSim/Region/Framework/Scenes/Animation/ScenePresenceAnimator.cs b/OpenSim/Region/Framework/Scenes/Animation/ScenePresenceAnimator.cs
index e9e1845..175e8ed 100644
--- a/OpenSim/Region/Framework/Scenes/Animation/ScenePresenceAnimator.cs
+++ b/OpenSim/Region/Framework/Scenes/Animation/ScenePresenceAnimator.cs
@@ -26,6 +26,7 @@
26 */ 26 */
27 27
28using System; 28using System;
29using System.Threading;
29using System.Collections.Generic; 30using System.Collections.Generic;
30using System.Reflection; 31using System.Reflection;
31using log4net; 32using log4net;
@@ -42,7 +43,7 @@ namespace OpenSim.Region.Framework.Scenes.Animation
42 /// </summary> 43 /// </summary>
43 public class ScenePresenceAnimator 44 public class ScenePresenceAnimator
44 { 45 {
45// private static readonly ILog m_log = LogManager.GetLogger(MethodBase.GetCurrentMethod().DeclaringType); 46 private static readonly ILog m_log = LogManager.GetLogger(MethodBase.GetCurrentMethod().DeclaringType);
46 47
47 public AnimationSet Animations 48 public AnimationSet Animations
48 { 49 {
@@ -57,11 +58,17 @@ namespace OpenSim.Region.Framework.Scenes.Animation
57 { 58 {
58 get { return m_movementAnimation; } 59 get { return m_movementAnimation; }
59 } 60 }
60 protected string m_movementAnimation = "DEFAULT"; 61 // protected string m_movementAnimation = "DEFAULT"; //KF: 'DEFAULT' does not exist!
61 62 protected string m_movementAnimation = "CROUCH"; //KF: CROUCH ensures reliable Av Anim. init.
62 private int m_animTickFall; 63 private int m_animTickFall;
63 private int m_animTickJump; 64// private int m_animTickJump;
64 65 public int m_animTickJump; // ScenePresence has to see this to control +Z force
66 public bool m_jumping = false; // Add for jumping
67 public float m_jumpVelocity = 0f; // Add for jumping
68 private int m_landing = 0; // Add for jumping
69 public bool m_falling = false; // Add for falling
70 private float m_fallHeight; // Add for falling
71
65 /// <value> 72 /// <value>
66 /// The scene presence that this animator applies to 73 /// The scene presence that this animator applies to
67 /// </value> 74 /// </value>
@@ -122,7 +129,9 @@ namespace OpenSim.Region.Framework.Scenes.Animation
122 129
123 public void ResetAnimations() 130 public void ResetAnimations()
124 { 131 {
132Console.WriteLine("ResetA.............");
125 m_animations.Clear(); 133 m_animations.Clear();
134TrySetMovementAnimation("STAND");
126 } 135 }
127 136
128 /// <summary> 137 /// <summary>
@@ -152,15 +161,16 @@ namespace OpenSim.Region.Framework.Scenes.Animation
152 /// </summary> 161 /// </summary>
153 public string GetMovementAnimation() 162 public string GetMovementAnimation()
154 { 163 {
155 const float FALL_DELAY = 0.33f; 164//Console.WriteLine("GMA-------"); //##
156 const float PREJUMP_DELAY = 0.25f; 165//#@ const float FALL_DELAY = 0.33f;
157 166 const float FALL_DELAY = 800f; //## mS
167//rm for jumping const float PREJUMP_DELAY = 0.25f;
168 const float PREJUMP_DELAY = 200f; // mS add for jumping
169 const float JUMP_PERIOD = 800f; // mS add for jumping
158 #region Inputs 170 #region Inputs
159 if (m_scenePresence.SitGround) 171
160 {
161 return "SIT_GROUND_CONSTRAINED";
162 }
163 AgentManager.ControlFlags controlFlags = (AgentManager.ControlFlags)m_scenePresence.AgentControlFlags; 172 AgentManager.ControlFlags controlFlags = (AgentManager.ControlFlags)m_scenePresence.AgentControlFlags;
173// m_log.DebugFormat("[ANIM]: Control flags: {0}", controlFlags);
164 PhysicsActor actor = m_scenePresence.PhysicsActor; 174 PhysicsActor actor = m_scenePresence.PhysicsActor;
165 175
166 // Create forward and left vectors from the current avatar rotation 176 // Create forward and left vectors from the current avatar rotation
@@ -169,13 +179,12 @@ namespace OpenSim.Region.Framework.Scenes.Animation
169 Vector3 left = Vector3.Transform(Vector3.UnitY, rotMatrix); 179 Vector3 left = Vector3.Transform(Vector3.UnitY, rotMatrix);
170 180
171 // Check control flags 181 // Check control flags
172 bool heldForward = 182 bool heldForward = ((controlFlags & AgentManager.ControlFlags.AGENT_CONTROL_AT_POS) == AgentManager.ControlFlags.AGENT_CONTROL_AT_POS || (controlFlags & AgentManager.ControlFlags.AGENT_CONTROL_NUDGE_AT_POS) == AgentManager.ControlFlags.AGENT_CONTROL_NUDGE_AT_POS);
173 (((controlFlags & AgentManager.ControlFlags.AGENT_CONTROL_AT_POS) == AgentManager.ControlFlags.AGENT_CONTROL_AT_POS) || ((controlFlags & AgentManager.ControlFlags.AGENT_CONTROL_NUDGE_AT_POS) == AgentManager.ControlFlags.AGENT_CONTROL_NUDGE_AT_POS)); 183 bool heldBack = ((controlFlags & AgentManager.ControlFlags.AGENT_CONTROL_AT_NEG) == AgentManager.ControlFlags.AGENT_CONTROL_AT_NEG || (controlFlags & AgentManager.ControlFlags.AGENT_CONTROL_NUDGE_AT_NEG) == AgentManager.ControlFlags.AGENT_CONTROL_NUDGE_AT_NEG);
174 bool heldBack = (controlFlags & AgentManager.ControlFlags.AGENT_CONTROL_AT_NEG) == AgentManager.ControlFlags.AGENT_CONTROL_AT_NEG; 184 bool heldLeft = ((controlFlags & AgentManager.ControlFlags.AGENT_CONTROL_LEFT_POS) == AgentManager.ControlFlags.AGENT_CONTROL_LEFT_POS || (controlFlags & AgentManager.ControlFlags.AGENT_CONTROL_NUDGE_LEFT_POS) == AgentManager.ControlFlags.AGENT_CONTROL_NUDGE_LEFT_POS);
175 bool heldLeft = (controlFlags & AgentManager.ControlFlags.AGENT_CONTROL_LEFT_POS) == AgentManager.ControlFlags.AGENT_CONTROL_LEFT_POS; 185 bool heldRight = ((controlFlags & AgentManager.ControlFlags.AGENT_CONTROL_LEFT_NEG) == AgentManager.ControlFlags.AGENT_CONTROL_LEFT_NEG || (controlFlags & AgentManager.ControlFlags.AGENT_CONTROL_NUDGE_LEFT_NEG) == AgentManager.ControlFlags.AGENT_CONTROL_NUDGE_LEFT_NEG);
176 bool heldRight = (controlFlags & AgentManager.ControlFlags.AGENT_CONTROL_LEFT_NEG) == AgentManager.ControlFlags.AGENT_CONTROL_LEFT_NEG; 186 //bool heldTurnLeft = (controlFlags & AgentManager.ControlFlags.AGENT_CONTROL_TURN_LEFT) == AgentManager.ControlFlags.AGENT_CONTROL_TURN_LEFT;
177 bool heldTurnLeft = (controlFlags & AgentManager.ControlFlags.AGENT_CONTROL_TURN_LEFT) == AgentManager.ControlFlags.AGENT_CONTROL_TURN_LEFT; 187 //bool heldTurnRight = (controlFlags & AgentManager.ControlFlags.AGENT_CONTROL_TURN_RIGHT) == AgentManager.ControlFlags.AGENT_CONTROL_TURN_RIGHT;
178 bool heldTurnRight = (controlFlags & AgentManager.ControlFlags.AGENT_CONTROL_TURN_RIGHT) == AgentManager.ControlFlags.AGENT_CONTROL_TURN_RIGHT;
179 bool heldUp = (controlFlags & AgentManager.ControlFlags.AGENT_CONTROL_UP_POS) == AgentManager.ControlFlags.AGENT_CONTROL_UP_POS; 188 bool heldUp = (controlFlags & AgentManager.ControlFlags.AGENT_CONTROL_UP_POS) == AgentManager.ControlFlags.AGENT_CONTROL_UP_POS;
180 bool heldDown = (controlFlags & AgentManager.ControlFlags.AGENT_CONTROL_UP_NEG) == AgentManager.ControlFlags.AGENT_CONTROL_UP_NEG; 189 bool heldDown = (controlFlags & AgentManager.ControlFlags.AGENT_CONTROL_UP_NEG) == AgentManager.ControlFlags.AGENT_CONTROL_UP_NEG;
181 //bool flying = (controlFlags & AgentManager.ControlFlags.AGENT_CONTROL_FLY) == AgentManager.ControlFlags.AGENT_CONTROL_FLY; 190 //bool flying = (controlFlags & AgentManager.ControlFlags.AGENT_CONTROL_FLY) == AgentManager.ControlFlags.AGENT_CONTROL_FLY;
@@ -183,17 +192,16 @@ namespace OpenSim.Region.Framework.Scenes.Animation
183 192
184 // Direction in which the avatar is trying to move 193 // Direction in which the avatar is trying to move
185 Vector3 move = Vector3.Zero; 194 Vector3 move = Vector3.Zero;
186 if (heldForward) { move.X += fwd.X; move.Y += fwd.Y; }
187 if (heldBack) { move.X -= fwd.X; move.Y -= fwd.Y; } 195 if (heldBack) { move.X -= fwd.X; move.Y -= fwd.Y; }
188 if (heldLeft) { move.X += left.X; move.Y += left.Y; } 196 if (heldLeft) { move.X += left.X; move.Y += left.Y; }
189 if (heldRight) { move.X -= left.X; move.Y -= left.Y; } 197 if (heldRight) { move.X -= left.X; move.Y -= left.Y; }
190 if (heldUp) { move.Z += 1; } 198 if (heldUp) { move.Z += 1; }
191 if (heldDown) { move.Z -= 1; } 199 if (heldDown) { move.Z -= 1; }
200 if (heldForward) { move.X += fwd.X; move.Y += fwd.Y; }
192 201
193 // Is the avatar trying to move? 202 // Is the avatar trying to move?
194// bool moving = (move != Vector3.Zero); 203// bool moving = (move != Vector3.Zero);
195 bool jumping = m_animTickJump != 0; 204// rm for jumping bool jumping = m_animTickJump != 0;
196
197 #endregion Inputs 205 #endregion Inputs
198 206
199 #region Flying 207 #region Flying
@@ -202,6 +210,11 @@ namespace OpenSim.Region.Framework.Scenes.Animation
202 { 210 {
203 m_animTickFall = 0; 211 m_animTickFall = 0;
204 m_animTickJump = 0; 212 m_animTickJump = 0;
213 m_jumping = false; //add for jumping
214 m_falling = true; //add for falling
215 m_jumpVelocity = 0f; //add for jumping
216 actor.Selected = false; //add for jumping flag
217 m_fallHeight = actor.Position.Z; // save latest flying height
205 218
206 if (move.X != 0f || move.Y != 0f) 219 if (move.X != 0f || move.Y != 0f)
207 { 220 {
@@ -213,8 +226,11 @@ namespace OpenSim.Region.Framework.Scenes.Animation
213 } 226 }
214 else if (move.Z < 0f) 227 else if (move.Z < 0f)
215 { 228 {
216 if (actor != null && actor.IsColliding) 229 if (actor != null && actor.IsColliding)
230 { //##
231//Console.WriteLine("LAND FLYING"); // ##
217 return "LAND"; 232 return "LAND";
233 } //#
218 else 234 else
219 return "HOVER_DOWN"; 235 return "HOVER_DOWN";
220 } 236 }
@@ -228,48 +244,127 @@ namespace OpenSim.Region.Framework.Scenes.Animation
228 244
229 #region Falling/Floating/Landing 245 #region Falling/Floating/Landing
230 246
231 if (actor == null || !actor.IsColliding) 247// rm for jumping if (actor == null || !actor.IsColliding)
248 if ((actor == null || !actor.IsColliding) && !m_jumping) // add for jumping
232 { 249 {
233 float fallElapsed = (float)(Environment.TickCount - m_animTickFall) / 1000f; 250// rm float fallElapsed = (float)(Environment.TickCount - m_animTickFall) / 1000f;
251 float fallElapsed = (float)(Environment.TickCount - m_animTickFall); // add, in mS
234 float fallVelocity = (actor != null) ? actor.Velocity.Z : 0.0f; 252 float fallVelocity = (actor != null) ? actor.Velocity.Z : 0.0f;
253//Console.WriteLine("falling t={0} v={1}", fallElapsed, fallVelocity); //##
254
255// rm for fall if (m_animTickFall == 0 || (fallElapsed > FALL_DELAY && fallVelocity >= 0.0f))
256 if (!m_jumping && (fallVelocity < -3.0f) ) m_falling = true; // add for falling and jumping
235 257
236 if (m_animTickFall == 0 || (fallElapsed > FALL_DELAY && fallVelocity >= 0.0f)) 258 if (m_animTickFall == 0 || (fallVelocity >= 0.0f)) // add for jumping
259 // not falling yet or going up
237 { 260 {
238 // Just started falling 261 // reset start of fall time
239 m_animTickFall = Environment.TickCount; 262 m_animTickFall = Environment.TickCount;
240 } 263 }
241 else if (!jumping && fallElapsed > FALL_DELAY) 264// else if (!jumping && fallElapsed > FALL_DELAY)
265 else if (!m_jumping && (fallElapsed > FALL_DELAY) && (fallVelocity < -3.0f) && (m_scenePresence.m_wasFlying)) // add for falling and jumping
242 { 266 {
243 // Falling long enough to trigger the animation 267 // Falling long enough to trigger the animation
268//Console.WriteLine("FALLDOWN"); //##
244 return "FALLDOWN"; 269 return "FALLDOWN";
245 } 270 }
246 else if (m_animTickJump == -1)
247 {
248 m_animTickJump = 0;
249 return "STAND";
250 }
251 271
252 return m_movementAnimation; 272 return m_movementAnimation;
253 } 273 }
254 274
255 #endregion Falling/Floating/Landing 275 #endregion Falling/Floating/Landing
256 276
277
278 #region Jumping // section added for jumping...
279
280 int jumptime;
281 jumptime = Environment.TickCount - m_animTickJump;
282
283
284 if ((move.Z > 0f) && (!m_jumping))
285 {
286//Console.WriteLine("PJ {0}", jumptime); //##
287 // Start jumping, prejump
288 m_animTickFall = 0;
289 m_jumping = true;
290 m_falling = false;
291 actor.Selected = true; // borrowed for jmping flag
292 m_animTickJump = Environment.TickCount;
293 m_jumpVelocity = 0.35f;
294 return "PREJUMP";
295 }
296
297 if(m_jumping)
298 {
299 if ( (jumptime > (JUMP_PERIOD * 1.5f)) && actor.IsColliding)
300 {
301//Console.WriteLine("LA {0}", jumptime); //##
302 // end jumping
303 m_jumping = false;
304 m_falling = false;
305 actor.Selected = false; // borrowed for jumping flag
306 m_jumpVelocity = 0f;
307 m_animTickFall = Environment.TickCount;
308 return "LAND";
309 }
310 else if (jumptime > JUMP_PERIOD)
311 {
312//Console.WriteLine("JD {0}", jumptime); //##
313 // jump down
314 m_jumpVelocity = 0f;
315 return "JUMP";
316 }
317 else if (jumptime > PREJUMP_DELAY)
318 {
319//Console.WriteLine("JU {0}", jumptime); //##
320 // jump up
321 m_jumping = true;
322 m_jumpVelocity = 10f;
323 return "JUMP";
324 }
325 }
326
327 #endregion Jumping // end added section
328
257 #region Ground Movement 329 #region Ground Movement
258 330
259 if (m_movementAnimation == "FALLDOWN") 331 if (m_movementAnimation == "FALLDOWN")
260 { 332 {
333 m_falling = false;
261 m_animTickFall = Environment.TickCount; 334 m_animTickFall = Environment.TickCount;
262
263 // TODO: SOFT_LAND support 335 // TODO: SOFT_LAND support
264 return "LAND"; 336 float fallHeight = m_fallHeight - actor.Position.Z;
337//Console.WriteLine("Hit from {0}", fallHeight); //##
338 if (fallHeight > 15.0f) // add for falling
339 return "STANDUP";
340 else if (fallHeight > 8.0f) // add for falling
341 return "SOFT_LAND"; // add for falling
342 else // add for falling
343 return "LAND"; // add for falling
265 } 344 }
266 else if (m_movementAnimation == "LAND") 345// rm jumping float landElapsed = (float)(Environment.TickCount - m_animTickFall) / 1000f;
346// rm jumping if ((m_animTickFall != 0) && (landElapsed <= FALL_DELAY))
347// rm for landing return "LAND";
348 else if ((m_movementAnimation == "LAND") || (m_movementAnimation == "SOFT_LAND") || (m_movementAnimation == "STANDUP"))
267 { 349 {
268 float landElapsed = (float)(Environment.TickCount - m_animTickFall) / 1000f; 350 int landElapsed = Environment.TickCount - m_animTickFall; // add for jumping
269 if ((m_animTickFall != 0) && (landElapsed <= FALL_DELAY)) 351 int limit = 1000; // add for jumping
270 return "LAND"; 352 if(m_movementAnimation == "LAND") limit = 350; // add for jumping
271 } 353 // NB if the above is set too long a weird anim reset from some place prevents STAND from being sent to client
272 354
355 if ((m_animTickFall != 0) && (landElapsed <= limit)) // add for jumping
356 {
357//Console.WriteLine("Lelapse {0}", m_movementAnimation); //##
358 return m_movementAnimation;
359 }
360 else
361 {
362//Console.WriteLine("end/STAND"); //##
363 m_fallHeight = actor.Position.Z; // save latest flying height
364 return "STAND";
365 }
366 }
367/* This section removed, replaced by jumping section
273 m_animTickFall = 0; 368 m_animTickFall = 0;
274 369
275 if (move.Z > 0.2f) 370 if (move.Z > 0.2f)
@@ -281,7 +376,7 @@ namespace OpenSim.Region.Framework.Scenes.Animation
281 m_animTickJump = Environment.TickCount; 376 m_animTickJump = Environment.TickCount;
282 return "PREJUMP"; 377 return "PREJUMP";
283 } 378 }
284 else if (Environment.TickCount - m_animTickJump > PREJUMP_DELAY * 1000.0f) 379 else if (Environment.TickCount - m_animTickJump > PREJUMP_DELAY * 800.0f)
285 { 380 {
286 // Start actual jump 381 // Start actual jump
287 if (m_animTickJump == -1) 382 if (m_animTickJump == -1)
@@ -294,41 +389,44 @@ namespace OpenSim.Region.Framework.Scenes.Animation
294 m_animTickJump = -1; 389 m_animTickJump = -1;
295 return "JUMP"; 390 return "JUMP";
296 } 391 }
297 else
298 return "JUMP";
299 } 392 }
300 else 393 else
301 { 394 {
302 // Not jumping 395 // Not jumping
303 m_animTickJump = 0; 396 m_animTickJump = 0;
304 397 */
305 if (move.X != 0f || move.Y != 0f) 398 // next section moved outside paren. and realigned for jumping
306 { 399 if (move.X != 0f || move.Y != 0f)
307 // Walking / crouchwalking / running 400 {
308 if (move.Z < 0) 401 m_fallHeight = actor.Position.Z; // save latest flying height
309 return "CROUCHWALK"; 402 m_falling = false; // Add for falling
310 else if (m_scenePresence.SetAlwaysRun) 403 // Walking / crouchwalking / running
311 return "RUN"; 404 if (move.Z < 0f)
312 else 405 return "CROUCHWALK";
313 return "WALK"; 406 else if (m_scenePresence.SetAlwaysRun)
314 } 407 return "RUN";
315 else 408 else
316 { 409 return "WALK";
317 // Not walking
318 if (move.Z < 0)
319 return "CROUCH";
320 else if (heldTurnLeft)
321 return "TURNLEFT";
322 else if (heldTurnRight)
323 return "TURNRIGHT";
324 else
325 return "STAND";
326 }
327 } 410 }
328 411// rm for jumping else
412 else if (!m_jumping) // add for jumping
413 {
414 m_falling = false; // Add for falling
415 // Not walking
416 if (move.Z < 0)
417 return "CROUCH";
418// else if (heldTurnLeft)
419// return "TURNLEFT";
420// else if (heldTurnRight)
421// return "TURNRIGHT";
422 else
423 return "STAND";
424 }
425 // end section realign for jumping
329 #endregion Ground Movement 426 #endregion Ground Movement
330 427
331 //return m_movementAnimation; 428 m_falling = false; // Add for falling
429 return m_movementAnimation;
332 } 430 }
333 431
334 /// <summary> 432 /// <summary>
@@ -337,9 +435,15 @@ namespace OpenSim.Region.Framework.Scenes.Animation
337 public void UpdateMovementAnimations() 435 public void UpdateMovementAnimations()
338 { 436 {
339 m_movementAnimation = GetMovementAnimation(); 437 m_movementAnimation = GetMovementAnimation();
340// m_log.DebugFormat( 438/* if (m_movementAnimation == "PREJUMP" && !m_scenePresence.Scene.m_usePreJump)
341// "[SCENE PRESENCE ANIMATOR]: Got animation {0} for {1}", m_movementAnimation, m_scenePresence.Name); 439 {
342 TrySetMovementAnimation(m_movementAnimation); 440 // This was the previous behavior before PREJUMP
441 TrySetMovementAnimation("JUMP");
442 }
443 else
444 { removed for jumping */
445 TrySetMovementAnimation(m_movementAnimation);
446// rm for jumping }
343 } 447 }
344 448
345 public UUID[] GetAnimationArray() 449 public UUID[] GetAnimationArray()
diff --git a/OpenSim/Region/Framework/Scenes/AsyncSceneObjectGroupDeleter.cs b/OpenSim/Region/Framework/Scenes/AsyncSceneObjectGroupDeleter.cs
index 0ac3899..12688bd 100644
--- a/OpenSim/Region/Framework/Scenes/AsyncSceneObjectGroupDeleter.cs
+++ b/OpenSim/Region/Framework/Scenes/AsyncSceneObjectGroupDeleter.cs
@@ -104,8 +104,15 @@ namespace OpenSim.Region.Framework.Scenes
104 // better than losing the object for now. 104 // better than losing the object for now.
105 if (permissionToDelete) 105 if (permissionToDelete)
106 { 106 {
107 List<uint> killIDs = new List<uint>();
108
107 foreach (SceneObjectGroup g in objectGroups) 109 foreach (SceneObjectGroup g in objectGroups)
110 {
111 killIDs.Add(g.LocalId);
108 g.DeleteGroupFromScene(false); 112 g.DeleteGroupFromScene(false);
113 }
114
115 m_scene.SendKillObject(killIDs);
109 } 116 }
110 } 117 }
111 118
diff --git a/OpenSim/Region/Framework/Scenes/EventManager.cs b/OpenSim/Region/Framework/Scenes/EventManager.cs
index 96da2c3..65c6a29 100644
--- a/OpenSim/Region/Framework/Scenes/EventManager.cs
+++ b/OpenSim/Region/Framework/Scenes/EventManager.cs
@@ -55,8 +55,12 @@ namespace OpenSim.Region.Framework.Scenes
55 55
56 public delegate void OnTerrainTickDelegate(); 56 public delegate void OnTerrainTickDelegate();
57 57
58 public delegate void OnTerrainUpdateDelegate();
59
58 public event OnTerrainTickDelegate OnTerrainTick; 60 public event OnTerrainTickDelegate OnTerrainTick;
59 61
62 public event OnTerrainUpdateDelegate OnTerrainUpdate;
63
60 public delegate void OnBackupDelegate(ISimulationDataService datastore, bool forceBackup); 64 public delegate void OnBackupDelegate(ISimulationDataService datastore, bool forceBackup);
61 65
62 public event OnBackupDelegate OnBackup; 66 public event OnBackupDelegate OnBackup;
@@ -775,6 +779,26 @@ namespace OpenSim.Region.Framework.Scenes
775 } 779 }
776 } 780 }
777 } 781 }
782 public void TriggerTerrainUpdate()
783 {
784 OnTerrainUpdateDelegate handlerTerrainUpdate = OnTerrainUpdate;
785 if (handlerTerrainUpdate != null)
786 {
787 foreach (OnTerrainUpdateDelegate d in handlerTerrainUpdate.GetInvocationList())
788 {
789 try
790 {
791 d();
792 }
793 catch (Exception e)
794 {
795 m_log.ErrorFormat(
796 "[EVENT MANAGER]: Delegate for TriggerTerrainUpdate failed - continuing. {0} {1}",
797 e.Message, e.StackTrace);
798 }
799 }
800 }
801 }
778 802
779 public void TriggerTerrainTick() 803 public void TriggerTerrainTick()
780 { 804 {
diff --git a/OpenSim/Region/Framework/Scenes/Prioritizer.cs b/OpenSim/Region/Framework/Scenes/Prioritizer.cs
index 1b10e3c..0a34a4c 100644
--- a/OpenSim/Region/Framework/Scenes/Prioritizer.cs
+++ b/OpenSim/Region/Framework/Scenes/Prioritizer.cs
@@ -157,7 +157,7 @@ namespace OpenSim.Region.Framework.Scenes
157 157
158 private uint GetPriorityByBestAvatarResponsiveness(IClientAPI client, ISceneEntity entity) 158 private uint GetPriorityByBestAvatarResponsiveness(IClientAPI client, ISceneEntity entity)
159 { 159 {
160 uint pqueue = ComputeDistancePriority(client,entity,true); 160 uint pqueue = ComputeDistancePriority(client,entity,false);
161 161
162 ScenePresence presence = m_scene.GetScenePresence(client.AgentId); 162 ScenePresence presence = m_scene.GetScenePresence(client.AgentId);
163 if (presence != null) 163 if (presence != null)
@@ -226,7 +226,7 @@ namespace OpenSim.Region.Framework.Scenes
226 226
227 for (int i = 0; i < queues - 1; i++) 227 for (int i = 0; i < queues - 1; i++)
228 { 228 {
229 if (distance < 10 * Math.Pow(2.0,i)) 229 if (distance < 30 * Math.Pow(2.0,i))
230 break; 230 break;
231 pqueue++; 231 pqueue++;
232 } 232 }
diff --git a/OpenSim/Region/Framework/Scenes/Scene.Inventory.cs b/OpenSim/Region/Framework/Scenes/Scene.Inventory.cs
index 663aa22..53f0f2e 100644
--- a/OpenSim/Region/Framework/Scenes/Scene.Inventory.cs
+++ b/OpenSim/Region/Framework/Scenes/Scene.Inventory.cs
@@ -124,34 +124,22 @@ namespace OpenSim.Region.Framework.Scenes
124 /// <param name="item"></param> 124 /// <param name="item"></param>
125 public bool AddInventoryItem(InventoryItemBase item) 125 public bool AddInventoryItem(InventoryItemBase item)
126 { 126 {
127 if (UUID.Zero == item.Folder) 127 InventoryFolderBase folder;
128
129 if (item.Folder == UUID.Zero)
128 { 130 {
129 InventoryFolderBase f = InventoryService.GetFolderForType(item.Owner, (AssetType)item.AssetType); 131 folder = InventoryService.GetFolderForType(item.Owner, (AssetType)item.AssetType);
130 if (f != null) 132 if (folder == null)
131 { 133 {
132// m_log.DebugFormat( 134 folder = InventoryService.GetRootFolder(item.Owner);
133// "[LOCAL INVENTORY SERVICES CONNECTOR]: Found folder {0} type {1} for item {2}", 135
134// f.Name, (AssetType)f.Type, item.Name); 136 if (folder == null)
135
136 item.Folder = f.ID;
137 }
138 else
139 {
140 f = InventoryService.GetRootFolder(item.Owner);
141 if (f != null)
142 {
143 item.Folder = f.ID;
144 }
145 else
146 {
147 m_log.WarnFormat(
148 "[AGENT INVENTORY]: Could not find root folder for {0} when trying to add item {1} with no parent folder specified",
149 item.Owner, item.Name);
150 return false; 137 return false;
151 }
152 } 138 }
139
140 item.Folder = folder.ID;
153 } 141 }
154 142
155 if (InventoryService.AddItem(item)) 143 if (InventoryService.AddItem(item))
156 { 144 {
157 int userlevel = 0; 145 int userlevel = 0;
@@ -271,8 +259,7 @@ namespace OpenSim.Region.Framework.Scenes
271 259
272 // Update item with new asset 260 // Update item with new asset
273 item.AssetID = asset.FullID; 261 item.AssetID = asset.FullID;
274 if (group.UpdateInventoryItem(item)) 262 group.UpdateInventoryItem(item);
275 remoteClient.SendAgentAlertMessage("Script saved", false);
276 263
277 part.SendPropertiesToClient(remoteClient); 264 part.SendPropertiesToClient(remoteClient);
278 265
@@ -283,12 +270,7 @@ namespace OpenSim.Region.Framework.Scenes
283 { 270 {
284 // Needs to determine which engine was running it and use that 271 // Needs to determine which engine was running it and use that
285 // 272 //
286 part.Inventory.CreateScriptInstance(item.ItemID, 0, false, DefaultScriptEngine, 0); 273 errors = part.Inventory.CreateScriptInstanceEr(item.ItemID, 0, false, DefaultScriptEngine, 0);
287 errors = part.Inventory.GetScriptErrors(item.ItemID);
288 }
289 else
290 {
291 remoteClient.SendAgentAlertMessage("Script saved", false);
292 } 274 }
293 part.ParentGroup.ResumeScripts(); 275 part.ParentGroup.ResumeScripts();
294 return errors; 276 return errors;
@@ -351,6 +333,7 @@ namespace OpenSim.Region.Framework.Scenes
351 { 333 {
352 if (UUID.Zero == transactionID) 334 if (UUID.Zero == transactionID)
353 { 335 {
336 item.Flags = (item.Flags & ~(uint)255) | (itemUpd.Flags & (uint)255);
354 item.Name = itemUpd.Name; 337 item.Name = itemUpd.Name;
355 item.Description = itemUpd.Description; 338 item.Description = itemUpd.Description;
356 if (item.NextPermissions != (itemUpd.NextPermissions & item.BasePermissions)) 339 if (item.NextPermissions != (itemUpd.NextPermissions & item.BasePermissions))
@@ -728,6 +711,8 @@ namespace OpenSim.Region.Framework.Scenes
728 return; 711 return;
729 } 712 }
730 713
714 if (newName == null) newName = item.Name;
715
731 AssetBase asset = AssetService.Get(item.AssetID.ToString()); 716 AssetBase asset = AssetService.Get(item.AssetID.ToString());
732 717
733 if (asset != null) 718 if (asset != null)
@@ -784,6 +769,24 @@ namespace OpenSim.Region.Framework.Scenes
784 } 769 }
785 770
786 /// <summary> 771 /// <summary>
772 /// Move an item within the agent's inventory, and leave a copy (used in making a new outfit)
773 /// </summary>
774 public void MoveInventoryItemsLeaveCopy(IClientAPI remoteClient, List<InventoryItemBase> items, UUID destfolder)
775 {
776 List<InventoryItemBase> moveitems = new List<InventoryItemBase>();
777 foreach (InventoryItemBase b in items)
778 {
779 CopyInventoryItem(remoteClient, 0, remoteClient.AgentId, b.ID, b.Folder, null);
780 InventoryItemBase n = InventoryService.GetItem(b);
781 n.Folder = destfolder;
782 moveitems.Add(n);
783 remoteClient.SendInventoryItemCreateUpdate(n, 0);
784 }
785
786 MoveInventoryItem(remoteClient, moveitems);
787 }
788
789 /// <summary>
787 /// Move an item within the agent's inventory. 790 /// Move an item within the agent's inventory.
788 /// </summary> 791 /// </summary>
789 /// <param name="remoteClient"></param> 792 /// <param name="remoteClient"></param>
@@ -984,25 +987,29 @@ namespace OpenSim.Region.Framework.Scenes
984 public void RemoveTaskInventory(IClientAPI remoteClient, UUID itemID, uint localID) 987 public void RemoveTaskInventory(IClientAPI remoteClient, UUID itemID, uint localID)
985 { 988 {
986 SceneObjectPart part = GetSceneObjectPart(localID); 989 SceneObjectPart part = GetSceneObjectPart(localID);
987 if (part == null) 990 SceneObjectGroup group = null;
988 return; 991 if (part != null)
992 {
993 group = part.ParentGroup;
994 }
995 if (part != null && group != null)
996 {
997 if (!Permissions.CanEditObjectInventory(part.UUID, remoteClient.AgentId))
998 return;
989 999
990 SceneObjectGroup group = part.ParentGroup; 1000 TaskInventoryItem item = group.GetInventoryItem(localID, itemID);
991 if (!Permissions.CanEditObjectInventory(part.UUID, remoteClient.AgentId)) 1001 if (item == null)
992 return; 1002 return;
993
994 TaskInventoryItem item = group.GetInventoryItem(localID, itemID);
995 if (item == null)
996 return;
997 1003
998 if (item.Type == 10) 1004 if (item.Type == 10)
999 { 1005 {
1000 part.RemoveScriptEvents(itemID); 1006 part.RemoveScriptEvents(itemID);
1001 EventManager.TriggerRemoveScript(localID, itemID); 1007 EventManager.TriggerRemoveScript(localID, itemID);
1008 }
1009
1010 group.RemoveInventoryItem(localID, itemID);
1011 part.SendPropertiesToClient(remoteClient);
1002 } 1012 }
1003
1004 group.RemoveInventoryItem(localID, itemID);
1005 part.SendPropertiesToClient(remoteClient);
1006 } 1013 }
1007 1014
1008 private InventoryItemBase CreateAgentInventoryItemFromTask(UUID destAgent, SceneObjectPart part, UUID itemId) 1015 private InventoryItemBase CreateAgentInventoryItemFromTask(UUID destAgent, SceneObjectPart part, UUID itemId)
@@ -1213,6 +1220,10 @@ namespace OpenSim.Region.Framework.Scenes
1213 if ((part.OwnerID != destPart.OwnerID) && ((srcTaskItem.CurrentPermissions & (uint)PermissionMask.Transfer) == 0)) 1220 if ((part.OwnerID != destPart.OwnerID) && ((srcTaskItem.CurrentPermissions & (uint)PermissionMask.Transfer) == 0))
1214 return; 1221 return;
1215 1222
1223 bool overrideNoMod = false;
1224 if ((part.GetEffectiveObjectFlags() & (uint)PrimFlags.AllowInventoryDrop) != 0)
1225 overrideNoMod = true;
1226
1216 if (part.OwnerID != destPart.OwnerID && (part.GetEffectiveObjectFlags() & (uint)PrimFlags.AllowInventoryDrop) == 0) 1227 if (part.OwnerID != destPart.OwnerID && (part.GetEffectiveObjectFlags() & (uint)PrimFlags.AllowInventoryDrop) == 0)
1217 { 1228 {
1218 // object cannot copy items to an object owned by a different owner 1229 // object cannot copy items to an object owned by a different owner
@@ -1222,7 +1233,7 @@ namespace OpenSim.Region.Framework.Scenes
1222 } 1233 }
1223 1234
1224 // must have both move and modify permission to put an item in an object 1235 // must have both move and modify permission to put an item in an object
1225 if ((part.OwnerMask & ((uint)PermissionMask.Move | (uint)PermissionMask.Modify)) == 0) 1236 if (((part.OwnerMask & (uint)PermissionMask.Modify) == 0) && (!overrideNoMod))
1226 { 1237 {
1227 return; 1238 return;
1228 } 1239 }
@@ -1281,6 +1292,14 @@ namespace OpenSim.Region.Framework.Scenes
1281 1292
1282 public UUID MoveTaskInventoryItems(UUID destID, string category, SceneObjectPart host, List<UUID> items) 1293 public UUID MoveTaskInventoryItems(UUID destID, string category, SceneObjectPart host, List<UUID> items)
1283 { 1294 {
1295 SceneObjectPart destPart = GetSceneObjectPart(destID);
1296 if (destPart != null) // Move into a prim
1297 {
1298 foreach(UUID itemID in items)
1299 MoveTaskInventoryItem(destID, host, itemID);
1300 return destID; // Prim folder ID == prim ID
1301 }
1302
1284 InventoryFolderBase rootFolder = InventoryService.GetRootFolder(destID); 1303 InventoryFolderBase rootFolder = InventoryService.GetRootFolder(destID);
1285 1304
1286 UUID newFolderID = UUID.Random(); 1305 UUID newFolderID = UUID.Random();
@@ -1460,13 +1479,6 @@ namespace OpenSim.Region.Framework.Scenes
1460 { 1479 {
1461 agentTransactions.HandleTaskItemUpdateFromTransaction( 1480 agentTransactions.HandleTaskItemUpdateFromTransaction(
1462 remoteClient, part, transactionID, currentItem); 1481 remoteClient, part, transactionID, currentItem);
1463
1464 if ((InventoryType)itemInfo.InvType == InventoryType.Notecard)
1465 remoteClient.SendAgentAlertMessage("Notecard saved", false);
1466 else if ((InventoryType)itemInfo.InvType == InventoryType.LSL)
1467 remoteClient.SendAgentAlertMessage("Script saved", false);
1468 else
1469 remoteClient.SendAgentAlertMessage("Item saved", false);
1470 } 1482 }
1471 1483
1472 // Base ALWAYS has move 1484 // Base ALWAYS has move
@@ -1607,7 +1619,7 @@ namespace OpenSim.Region.Framework.Scenes
1607 return; 1619 return;
1608 1620
1609 AssetBase asset = CreateAsset(itemBase.Name, itemBase.Description, (sbyte)itemBase.AssetType, 1621 AssetBase asset = CreateAsset(itemBase.Name, itemBase.Description, (sbyte)itemBase.AssetType,
1610 Encoding.ASCII.GetBytes("default\n{\n state_entry()\n {\n llSay(0, \"Script running\");\n }\n}"), 1622 Encoding.ASCII.GetBytes("default\n{\n state_entry()\n {\n llSay(0, \"Script running\");\n }\n\n touch_start(integer num)\n {\n }\n}"),
1611 remoteClient.AgentId); 1623 remoteClient.AgentId);
1612 AssetService.Store(asset); 1624 AssetService.Store(asset);
1613 1625
@@ -1760,23 +1772,32 @@ namespace OpenSim.Region.Framework.Scenes
1760 // build a list of eligible objects 1772 // build a list of eligible objects
1761 List<uint> deleteIDs = new List<uint>(); 1773 List<uint> deleteIDs = new List<uint>();
1762 List<SceneObjectGroup> deleteGroups = new List<SceneObjectGroup>(); 1774 List<SceneObjectGroup> deleteGroups = new List<SceneObjectGroup>();
1763 1775 List<SceneObjectGroup> takeGroups = new List<SceneObjectGroup>();
1764 // Start with true for both, then remove the flags if objects
1765 // that we can't derez are part of the selection
1766 bool permissionToTake = true;
1767 bool permissionToTakeCopy = true;
1768 bool permissionToDelete = true;
1769 1776
1770 foreach (uint localID in localIDs) 1777 foreach (uint localID in localIDs)
1771 { 1778 {
1779 // Start with true for both, then remove the flags if objects
1780 // that we can't derez are part of the selection
1781 bool permissionToTake = true;
1782 bool permissionToTakeCopy = true;
1783 bool permissionToDelete = true;
1784
1772 // Invalid id 1785 // Invalid id
1773 SceneObjectPart part = GetSceneObjectPart(localID); 1786 SceneObjectPart part = GetSceneObjectPart(localID);
1774 if (part == null) 1787 if (part == null)
1788 {
1789 //Client still thinks the object exists, kill it
1790 deleteIDs.Add(localID);
1775 continue; 1791 continue;
1792 }
1776 1793
1777 // Already deleted by someone else 1794 // Already deleted by someone else
1778 if (part.ParentGroup.IsDeleted) 1795 if (part.ParentGroup.IsDeleted)
1796 {
1797 //Client still thinks the object exists, kill it
1798 deleteIDs.Add(localID);
1779 continue; 1799 continue;
1800 }
1780 1801
1781 // Can't delete child prims 1802 // Can't delete child prims
1782 if (part != part.ParentGroup.RootPart) 1803 if (part != part.ParentGroup.RootPart)
@@ -1784,9 +1805,6 @@ namespace OpenSim.Region.Framework.Scenes
1784 1805
1785 SceneObjectGroup grp = part.ParentGroup; 1806 SceneObjectGroup grp = part.ParentGroup;
1786 1807
1787 deleteIDs.Add(localID);
1788 deleteGroups.Add(grp);
1789
1790 if (remoteClient == null) 1808 if (remoteClient == null)
1791 { 1809 {
1792 // Autoreturn has a null client. Nothing else does. So 1810 // Autoreturn has a null client. Nothing else does. So
@@ -1803,81 +1821,193 @@ namespace OpenSim.Region.Framework.Scenes
1803 } 1821 }
1804 else 1822 else
1805 { 1823 {
1806 if (!Permissions.CanTakeCopyObject(grp.UUID, remoteClient.AgentId)) 1824 if (action == DeRezAction.TakeCopy)
1825 {
1826 if (!Permissions.CanTakeCopyObject(grp.UUID, remoteClient.AgentId))
1827 permissionToTakeCopy = false;
1828 }
1829 else
1830 {
1807 permissionToTakeCopy = false; 1831 permissionToTakeCopy = false;
1808 1832 }
1809 if (!Permissions.CanTakeObject(grp.UUID, remoteClient.AgentId)) 1833 if (!Permissions.CanTakeObject(grp.UUID, remoteClient.AgentId))
1810 permissionToTake = false; 1834 permissionToTake = false;
1811 1835
1812 if (!Permissions.CanDeleteObject(grp.UUID, remoteClient.AgentId)) 1836 if (!Permissions.CanDeleteObject(grp.UUID, remoteClient.AgentId))
1813 permissionToDelete = false; 1837 permissionToDelete = false;
1814 } 1838 }
1815 }
1816 1839
1817 // Handle god perms 1840 // Handle god perms
1818 if ((remoteClient != null) && Permissions.IsGod(remoteClient.AgentId)) 1841 if ((remoteClient != null) && Permissions.IsGod(remoteClient.AgentId))
1819 { 1842 {
1820 permissionToTake = true; 1843 permissionToTake = true;
1821 permissionToTakeCopy = true; 1844 permissionToTakeCopy = true;
1822 permissionToDelete = true; 1845 permissionToDelete = true;
1823 } 1846 }
1824 1847
1825 // If we're re-saving, we don't even want to delete 1848 // If we're re-saving, we don't even want to delete
1826 if (action == DeRezAction.SaveToExistingUserInventoryItem) 1849 if (action == DeRezAction.SaveToExistingUserInventoryItem)
1827 permissionToDelete = false; 1850 permissionToDelete = false;
1828 1851
1829 // if we want to take a copy, we also don't want to delete 1852 // if we want to take a copy, we also don't want to delete
1830 // Note: after this point, the permissionToTakeCopy flag 1853 // Note: after this point, the permissionToTakeCopy flag
1831 // becomes irrelevant. It already includes the permissionToTake 1854 // becomes irrelevant. It already includes the permissionToTake
1832 // permission and after excluding no copy items here, we can 1855 // permission and after excluding no copy items here, we can
1833 // just use that. 1856 // just use that.
1834 if (action == DeRezAction.TakeCopy) 1857 if (action == DeRezAction.TakeCopy)
1835 { 1858 {
1836 // If we don't have permission, stop right here 1859 // If we don't have permission, stop right here
1837 if (!permissionToTakeCopy) 1860 if (!permissionToTakeCopy)
1838 return; 1861 return;
1839 1862
1840 permissionToTake = true; 1863 permissionToTake = true;
1841 // Don't delete 1864 // Don't delete
1842 permissionToDelete = false; 1865 permissionToDelete = false;
1843 } 1866 }
1844 1867
1845 if (action == DeRezAction.Return) 1868 if (action == DeRezAction.Return)
1846 {
1847 if (remoteClient != null)
1848 { 1869 {
1849 if (Permissions.CanReturnObjects( 1870 if (remoteClient != null)
1850 null,
1851 remoteClient.AgentId,
1852 deleteGroups))
1853 { 1871 {
1854 permissionToTake = true; 1872 if (Permissions.CanReturnObjects(
1855 permissionToDelete = true; 1873 null,
1856 1874 remoteClient.AgentId,
1857 foreach (SceneObjectGroup g in deleteGroups) 1875 deleteGroups))
1858 { 1876 {
1859 AddReturn(g.OwnerID, g.Name, g.AbsolutePosition, "parcel owner return"); 1877 permissionToTake = true;
1878 permissionToDelete = true;
1879
1880 AddReturn(grp.OwnerID, grp.Name, grp.AbsolutePosition, "parcel owner return");
1860 } 1881 }
1861 } 1882 }
1883 else // Auto return passes through here with null agent
1884 {
1885 permissionToTake = true;
1886 permissionToDelete = true;
1887 }
1862 } 1888 }
1863 else // Auto return passes through here with null agent 1889
1890 if (permissionToTake && (!permissionToDelete))
1891 takeGroups.Add(grp);
1892
1893 if (permissionToDelete)
1864 { 1894 {
1865 permissionToTake = true; 1895 if (permissionToTake)
1866 permissionToDelete = true; 1896 deleteGroups.Add(grp);
1897 deleteIDs.Add(grp.LocalId);
1867 } 1898 }
1868 } 1899 }
1869 1900
1870 if (permissionToTake) 1901 SendKillObject(deleteIDs);
1902
1903 if (deleteGroups.Count > 0)
1871 { 1904 {
1905 foreach (SceneObjectGroup g in deleteGroups)
1906 deleteIDs.Remove(g.LocalId);
1907
1872 m_asyncSceneObjectDeleter.DeleteToInventory( 1908 m_asyncSceneObjectDeleter.DeleteToInventory(
1873 action, destinationID, deleteGroups, remoteClient, 1909 action, destinationID, deleteGroups, remoteClient,
1874 permissionToDelete); 1910 true);
1875 } 1911 }
1876 else if (permissionToDelete) 1912 if (takeGroups.Count > 0)
1913 {
1914 m_asyncSceneObjectDeleter.DeleteToInventory(
1915 action, destinationID, takeGroups, remoteClient,
1916 false);
1917 }
1918 if (deleteIDs.Count > 0)
1877 { 1919 {
1878 foreach (SceneObjectGroup g in deleteGroups) 1920 foreach (SceneObjectGroup g in deleteGroups)
1879 DeleteSceneObject(g, false); 1921 DeleteSceneObject(g, true);
1922 }
1923 }
1924
1925 public UUID attachObjectAssetStore(IClientAPI remoteClient, SceneObjectGroup grp, UUID AgentId, out UUID itemID)
1926 {
1927 itemID = UUID.Zero;
1928 if (grp != null)
1929 {
1930 Vector3 inventoryStoredPosition = new Vector3
1931 (((grp.AbsolutePosition.X > (int)Constants.RegionSize)
1932 ? 250
1933 : grp.AbsolutePosition.X)
1934 ,
1935 (grp.AbsolutePosition.X > (int)Constants.RegionSize)
1936 ? 250
1937 : grp.AbsolutePosition.X,
1938 grp.AbsolutePosition.Z);
1939
1940 Vector3 originalPosition = grp.AbsolutePosition;
1941
1942 grp.AbsolutePosition = inventoryStoredPosition;
1943
1944 string sceneObjectXml = SceneObjectSerializer.ToOriginalXmlFormat(grp);
1945
1946 grp.AbsolutePosition = originalPosition;
1947
1948 AssetBase asset = CreateAsset(
1949 grp.GetPartName(grp.LocalId),
1950 grp.GetPartDescription(grp.LocalId),
1951 (sbyte)AssetType.Object,
1952 Utils.StringToBytes(sceneObjectXml),
1953 remoteClient.AgentId);
1954 AssetService.Store(asset);
1955
1956 InventoryItemBase item = new InventoryItemBase();
1957 item.CreatorId = grp.RootPart.CreatorID.ToString();
1958 item.CreatorData = grp.RootPart.CreatorData;
1959 item.Owner = remoteClient.AgentId;
1960 item.ID = UUID.Random();
1961 item.AssetID = asset.FullID;
1962 item.Description = asset.Description;
1963 item.Name = asset.Name;
1964 item.AssetType = asset.Type;
1965 item.InvType = (int)InventoryType.Object;
1966
1967 InventoryFolderBase folder = InventoryService.GetFolderForType(remoteClient.AgentId, AssetType.Object);
1968 if (folder != null)
1969 item.Folder = folder.ID;
1970 else // oopsies
1971 item.Folder = UUID.Zero;
1972
1973 // Set up base perms properly
1974 uint permsBase = (uint)(PermissionMask.Move | PermissionMask.Copy | PermissionMask.Transfer | PermissionMask.Modify);
1975 permsBase &= grp.RootPart.BaseMask;
1976 permsBase |= (uint)PermissionMask.Move;
1977
1978 // Make sure we don't lock it
1979 grp.RootPart.NextOwnerMask |= (uint)PermissionMask.Move;
1980
1981 if ((remoteClient.AgentId != grp.RootPart.OwnerID) && Permissions.PropagatePermissions())
1982 {
1983 item.BasePermissions = permsBase & grp.RootPart.NextOwnerMask;
1984 item.CurrentPermissions = permsBase & grp.RootPart.NextOwnerMask;
1985 item.NextPermissions = permsBase & grp.RootPart.NextOwnerMask;
1986 item.EveryOnePermissions = permsBase & grp.RootPart.EveryoneMask & grp.RootPart.NextOwnerMask;
1987 item.GroupPermissions = permsBase & grp.RootPart.GroupMask & grp.RootPart.NextOwnerMask;
1988 }
1989 else
1990 {
1991 item.BasePermissions = permsBase;
1992 item.CurrentPermissions = permsBase & grp.RootPart.OwnerMask;
1993 item.NextPermissions = permsBase & grp.RootPart.NextOwnerMask;
1994 item.EveryOnePermissions = permsBase & grp.RootPart.EveryoneMask;
1995 item.GroupPermissions = permsBase & grp.RootPart.GroupMask;
1996 }
1997 item.CreationDate = Util.UnixTimeSinceEpoch();
1998
1999 // sets itemID so client can show item as 'attached' in inventory
2000 grp.SetFromItemID(item.ID);
2001
2002 if (AddInventoryItem(item))
2003 remoteClient.SendInventoryItemCreateUpdate(item, 0);
2004 else
2005 m_dialogModule.SendAlertToUser(remoteClient, "Operation failed");
2006
2007 itemID = item.ID;
2008 return item.AssetID;
1880 } 2009 }
2010 return UUID.Zero;
1881 } 2011 }
1882 2012
1883 /// <summary> 2013 /// <summary>
@@ -2006,6 +2136,9 @@ namespace OpenSim.Region.Framework.Scenes
2006 2136
2007 public void SetScriptRunning(IClientAPI controllingClient, UUID objectID, UUID itemID, bool running) 2137 public void SetScriptRunning(IClientAPI controllingClient, UUID objectID, UUID itemID, bool running)
2008 { 2138 {
2139 if (!Permissions.CanEditScript(itemID, objectID, controllingClient.AgentId))
2140 return;
2141
2009 SceneObjectPart part = GetSceneObjectPart(objectID); 2142 SceneObjectPart part = GetSceneObjectPart(objectID);
2010 if (part == null) 2143 if (part == null)
2011 return; 2144 return;
diff --git a/OpenSim/Region/Framework/Scenes/Scene.PacketHandlers.cs b/OpenSim/Region/Framework/Scenes/Scene.PacketHandlers.cs
index 270e582..575079f 100644
--- a/OpenSim/Region/Framework/Scenes/Scene.PacketHandlers.cs
+++ b/OpenSim/Region/Framework/Scenes/Scene.PacketHandlers.cs
@@ -374,7 +374,10 @@ namespace OpenSim.Region.Framework.Scenes
374 List<UserAccount> accounts = UserAccountService.GetUserAccounts(RegionInfo.ScopeID, query); 374 List<UserAccount> accounts = UserAccountService.GetUserAccounts(RegionInfo.ScopeID, query);
375 375
376 if (accounts == null) 376 if (accounts == null)
377 {
378 m_log.DebugFormat("[LLCIENT]: ProcessAvatarPickerRequest: returned null result");
377 return; 379 return;
380 }
378 381
379 AvatarPickerReplyPacket replyPacket = (AvatarPickerReplyPacket) PacketPool.Instance.GetPacket(PacketType.AvatarPickerReply); 382 AvatarPickerReplyPacket replyPacket = (AvatarPickerReplyPacket) PacketPool.Instance.GetPacket(PacketType.AvatarPickerReply);
380 // TODO: don't create new blocks if recycling an old packet 383 // TODO: don't create new blocks if recycling an old packet
diff --git a/OpenSim/Region/Framework/Scenes/Scene.Permissions.cs b/OpenSim/Region/Framework/Scenes/Scene.Permissions.cs
index e1fedf4..48beb9c 100644
--- a/OpenSim/Region/Framework/Scenes/Scene.Permissions.cs
+++ b/OpenSim/Region/Framework/Scenes/Scene.Permissions.cs
@@ -49,6 +49,7 @@ namespace OpenSim.Region.Framework.Scenes
49 public delegate bool DuplicateObjectHandler(int objectCount, UUID objectID, UUID owner, Scene scene, Vector3 objectPosition); 49 public delegate bool DuplicateObjectHandler(int objectCount, UUID objectID, UUID owner, Scene scene, Vector3 objectPosition);
50 public delegate bool EditObjectHandler(UUID objectID, UUID editorID, Scene scene); 50 public delegate bool EditObjectHandler(UUID objectID, UUID editorID, Scene scene);
51 public delegate bool EditObjectInventoryHandler(UUID objectID, UUID editorID, Scene scene); 51 public delegate bool EditObjectInventoryHandler(UUID objectID, UUID editorID, Scene scene);
52 public delegate bool ViewObjectInventoryHandler(UUID objectID, UUID editorID, Scene scene);
52 public delegate bool MoveObjectHandler(UUID objectID, UUID moverID, Scene scene); 53 public delegate bool MoveObjectHandler(UUID objectID, UUID moverID, Scene scene);
53 public delegate bool ObjectEntryHandler(UUID objectID, bool enteringRegion, Vector3 newPoint, Scene scene); 54 public delegate bool ObjectEntryHandler(UUID objectID, bool enteringRegion, Vector3 newPoint, Scene scene);
54 public delegate bool ReturnObjectsHandler(ILandObject land, UUID user, List<SceneObjectGroup> objects, Scene scene); 55 public delegate bool ReturnObjectsHandler(ILandObject land, UUID user, List<SceneObjectGroup> objects, Scene scene);
@@ -116,6 +117,7 @@ namespace OpenSim.Region.Framework.Scenes
116 public event DuplicateObjectHandler OnDuplicateObject; 117 public event DuplicateObjectHandler OnDuplicateObject;
117 public event EditObjectHandler OnEditObject; 118 public event EditObjectHandler OnEditObject;
118 public event EditObjectInventoryHandler OnEditObjectInventory; 119 public event EditObjectInventoryHandler OnEditObjectInventory;
120 public event ViewObjectInventoryHandler OnViewObjectInventory;
119 public event MoveObjectHandler OnMoveObject; 121 public event MoveObjectHandler OnMoveObject;
120 public event ObjectEntryHandler OnObjectEntry; 122 public event ObjectEntryHandler OnObjectEntry;
121 public event ReturnObjectsHandler OnReturnObjects; 123 public event ReturnObjectsHandler OnReturnObjects;
@@ -401,6 +403,21 @@ namespace OpenSim.Region.Framework.Scenes
401 return true; 403 return true;
402 } 404 }
403 405
406 public bool CanViewObjectInventory(UUID objectID, UUID editorID)
407 {
408 ViewObjectInventoryHandler handler = OnViewObjectInventory;
409 if (handler != null)
410 {
411 Delegate[] list = handler.GetInvocationList();
412 foreach (ViewObjectInventoryHandler h in list)
413 {
414 if (h(objectID, editorID, m_scene) == false)
415 return false;
416 }
417 }
418 return true;
419 }
420
404 #endregion 421 #endregion
405 422
406 #region MOVE OBJECT 423 #region MOVE OBJECT
diff --git a/OpenSim/Region/Framework/Scenes/Scene.cs b/OpenSim/Region/Framework/Scenes/Scene.cs
index 086de53..c162519 100644
--- a/OpenSim/Region/Framework/Scenes/Scene.cs
+++ b/OpenSim/Region/Framework/Scenes/Scene.cs
@@ -96,6 +96,7 @@ namespace OpenSim.Region.Framework.Scenes
96 // TODO: need to figure out how allow client agents but deny 96 // TODO: need to figure out how allow client agents but deny
97 // root agents when ACL denies access to root agent 97 // root agents when ACL denies access to root agent
98 public bool m_strictAccessControl = true; 98 public bool m_strictAccessControl = true;
99 public bool m_seeIntoBannedRegion = false;
99 public int MaxUndoCount = 5; 100 public int MaxUndoCount = 5;
100 // Using this for RegionReady module to prevent LoginsDisabled from changing under our feet; 101 // Using this for RegionReady module to prevent LoginsDisabled from changing under our feet;
101 public bool LoginLock = false; 102 public bool LoginLock = false;
@@ -111,12 +112,14 @@ namespace OpenSim.Region.Framework.Scenes
111 112
112 protected int m_splitRegionID; 113 protected int m_splitRegionID;
113 protected Timer m_restartWaitTimer = new Timer(); 114 protected Timer m_restartWaitTimer = new Timer();
115 protected Timer m_timerWatchdog = new Timer();
114 protected List<RegionInfo> m_regionRestartNotifyList = new List<RegionInfo>(); 116 protected List<RegionInfo> m_regionRestartNotifyList = new List<RegionInfo>();
115 protected List<RegionInfo> m_neighbours = new List<RegionInfo>(); 117 protected List<RegionInfo> m_neighbours = new List<RegionInfo>();
116 protected string m_simulatorVersion = "OpenSimulator Server"; 118 protected string m_simulatorVersion = "OpenSimulator Server";
117 protected ModuleLoader m_moduleLoader; 119 protected ModuleLoader m_moduleLoader;
118 protected AgentCircuitManager m_authenticateHandler; 120 protected AgentCircuitManager m_authenticateHandler;
119 protected SceneCommunicationService m_sceneGridService; 121 protected SceneCommunicationService m_sceneGridService;
122 protected ISnmpModule m_snmpService = null;
120 123
121 protected ISimulationDataService m_SimulationDataService; 124 protected ISimulationDataService m_SimulationDataService;
122 protected IEstateDataService m_EstateDataService; 125 protected IEstateDataService m_EstateDataService;
@@ -168,7 +171,7 @@ namespace OpenSim.Region.Framework.Scenes
168 private int m_update_events = 1; 171 private int m_update_events = 1;
169 private int m_update_backup = 200; 172 private int m_update_backup = 200;
170 private int m_update_terrain = 50; 173 private int m_update_terrain = 50;
171// private int m_update_land = 1; 174 private int m_update_land = 10;
172 private int m_update_coarse_locations = 50; 175 private int m_update_coarse_locations = 50;
173 176
174 private int agentMS; 177 private int agentMS;
@@ -183,6 +186,7 @@ namespace OpenSim.Region.Framework.Scenes
183 private int landMS; 186 private int landMS;
184 private int lastCompletedFrame; 187 private int lastCompletedFrame;
185 188
189 public bool CombineRegions = false;
186 /// <summary> 190 /// <summary>
187 /// Signals whether temporary objects are currently being cleaned up. Needed because this is launched 191 /// Signals whether temporary objects are currently being cleaned up. Needed because this is launched
188 /// asynchronously from the update loop. 192 /// asynchronously from the update loop.
@@ -205,10 +209,12 @@ namespace OpenSim.Region.Framework.Scenes
205 private bool m_scripts_enabled = true; 209 private bool m_scripts_enabled = true;
206 private string m_defaultScriptEngine; 210 private string m_defaultScriptEngine;
207 private int m_LastLogin; 211 private int m_LastLogin;
208 private Thread HeartbeatThread; 212 private Thread HeartbeatThread = null;
209 private volatile bool shuttingdown; 213 private volatile bool shuttingdown;
210 214
211 private int m_lastUpdate; 215 private int m_lastUpdate;
216 private int m_lastIncoming;
217 private int m_lastOutgoing;
212 private bool m_firstHeartbeat = true; 218 private bool m_firstHeartbeat = true;
213 219
214 private object m_deleting_scene_object = new object(); 220 private object m_deleting_scene_object = new object();
@@ -256,6 +262,19 @@ namespace OpenSim.Region.Framework.Scenes
256 get { return m_sceneGridService; } 262 get { return m_sceneGridService; }
257 } 263 }
258 264
265 public ISnmpModule SnmpService
266 {
267 get
268 {
269 if (m_snmpService == null)
270 {
271 m_snmpService = RequestModuleInterface<ISnmpModule>();
272 }
273
274 return m_snmpService;
275 }
276 }
277
259 public ISimulationDataService SimulationDataService 278 public ISimulationDataService SimulationDataService
260 { 279 {
261 get 280 get
@@ -542,6 +561,9 @@ namespace OpenSim.Region.Framework.Scenes
542 m_EstateDataService = estateDataService; 561 m_EstateDataService = estateDataService;
543 m_regionHandle = m_regInfo.RegionHandle; 562 m_regionHandle = m_regInfo.RegionHandle;
544 m_regionName = m_regInfo.RegionName; 563 m_regionName = m_regInfo.RegionName;
564 m_lastUpdate = Util.EnvironmentTickCount();
565 m_lastIncoming = 0;
566 m_lastOutgoing = 0;
545 567
546 m_asyncSceneObjectDeleter = new AsyncSceneObjectGroupDeleter(this); 568 m_asyncSceneObjectDeleter = new AsyncSceneObjectGroupDeleter(this);
547 m_asyncSceneObjectDeleter.Enabled = true; 569 m_asyncSceneObjectDeleter.Enabled = true;
@@ -655,11 +677,13 @@ namespace OpenSim.Region.Framework.Scenes
655 //Animation states 677 //Animation states
656 m_useFlySlow = startupConfig.GetBoolean("enableflyslow", false); 678 m_useFlySlow = startupConfig.GetBoolean("enableflyslow", false);
657 // TODO: Change default to true once the feature is supported 679 // TODO: Change default to true once the feature is supported
658 m_usePreJump = startupConfig.GetBoolean("enableprejump", false); 680 m_usePreJump = startupConfig.GetBoolean("enableprejump", true);
659 681
660 m_physicalPrim = startupConfig.GetBoolean("physical_prim", true); 682 m_physicalPrim = startupConfig.GetBoolean("physical_prim", true);
661 683
662 m_maxNonphys = startupConfig.GetFloat("NonPhysicalPrimMax", m_maxNonphys); 684 m_maxNonphys = startupConfig.GetFloat("NonPhysicalPrimMax", m_maxNonphys);
685
686 m_log.DebugFormat("[SCENE]: prejump is {0}", m_usePreJump ? "ON" : "OFF");
663 if (RegionInfo.NonphysPrimMax > 0) 687 if (RegionInfo.NonphysPrimMax > 0)
664 { 688 {
665 m_maxNonphys = RegionInfo.NonphysPrimMax; 689 m_maxNonphys = RegionInfo.NonphysPrimMax;
@@ -691,6 +715,7 @@ namespace OpenSim.Region.Framework.Scenes
691 m_persistAfter *= 10000000; 715 m_persistAfter *= 10000000;
692 716
693 m_defaultScriptEngine = startupConfig.GetString("DefaultScriptEngine", "XEngine"); 717 m_defaultScriptEngine = startupConfig.GetString("DefaultScriptEngine", "XEngine");
718 m_log.InfoFormat("[SCENE]: Default script engine {0}", m_defaultScriptEngine);
694 719
695 IConfig packetConfig = m_config.Configs["PacketPool"]; 720 IConfig packetConfig = m_config.Configs["PacketPool"];
696 if (packetConfig != null) 721 if (packetConfig != null)
@@ -700,6 +725,8 @@ namespace OpenSim.Region.Framework.Scenes
700 } 725 }
701 726
702 m_strictAccessControl = startupConfig.GetBoolean("StrictAccessControl", m_strictAccessControl); 727 m_strictAccessControl = startupConfig.GetBoolean("StrictAccessControl", m_strictAccessControl);
728 m_seeIntoBannedRegion = startupConfig.GetBoolean("SeeIntoBannedRegion", m_seeIntoBannedRegion);
729 CombineRegions = startupConfig.GetBoolean("CombineContiguousRegions", false);
703 730
704 m_generateMaptiles = startupConfig.GetBoolean("GenerateMaptiles", true); 731 m_generateMaptiles = startupConfig.GetBoolean("GenerateMaptiles", true);
705 if (m_generateMaptiles) 732 if (m_generateMaptiles)
@@ -735,9 +762,9 @@ namespace OpenSim.Region.Framework.Scenes
735 m_update_terrain = startupConfig.GetInt( "UpdateTerrainEveryNFrames", m_update_terrain); 762 m_update_terrain = startupConfig.GetInt( "UpdateTerrainEveryNFrames", m_update_terrain);
736 m_update_temp_cleaning = startupConfig.GetInt( "UpdateTempCleaningEveryNFrames", m_update_temp_cleaning); 763 m_update_temp_cleaning = startupConfig.GetInt( "UpdateTempCleaningEveryNFrames", m_update_temp_cleaning);
737 } 764 }
738 catch 765 catch (Exception e)
739 { 766 {
740 m_log.Warn("[SCENE]: Failed to load StartupConfig"); 767 m_log.Error("[SCENE]: Failed to load StartupConfig: " + e.ToString());
741 } 768 }
742 769
743 #endregion Region Config 770 #endregion Region Config
@@ -1148,7 +1175,9 @@ namespace OpenSim.Region.Framework.Scenes
1148 //m_heartbeatTimer.Elapsed += new ElapsedEventHandler(Heartbeat); 1175 //m_heartbeatTimer.Elapsed += new ElapsedEventHandler(Heartbeat);
1149 if (HeartbeatThread != null) 1176 if (HeartbeatThread != null)
1150 { 1177 {
1178 m_log.ErrorFormat("[SCENE]: Restarting heartbeat thread because it hasn't reported in in region {0}", RegionInfo.RegionName);
1151 HeartbeatThread.Abort(); 1179 HeartbeatThread.Abort();
1180 Watchdog.AbortThread(HeartbeatThread.ManagedThreadId);
1152 HeartbeatThread = null; 1181 HeartbeatThread = null;
1153 } 1182 }
1154 m_lastUpdate = Util.EnvironmentTickCount(); 1183 m_lastUpdate = Util.EnvironmentTickCount();
@@ -1191,9 +1220,6 @@ namespace OpenSim.Region.Framework.Scenes
1191 { 1220 {
1192 while (!shuttingdown) 1221 while (!shuttingdown)
1193 Update(); 1222 Update();
1194
1195 m_lastUpdate = Util.EnvironmentTickCount();
1196 m_firstHeartbeat = false;
1197 } 1223 }
1198 catch (ThreadAbortException) 1224 catch (ThreadAbortException)
1199 { 1225 {
@@ -1291,6 +1317,13 @@ namespace OpenSim.Region.Framework.Scenes
1291 eventMS = Util.EnvironmentTickCountSubtract(evMS); ; 1317 eventMS = Util.EnvironmentTickCountSubtract(evMS); ;
1292 } 1318 }
1293 1319
1320 // if (Frame % m_update_land == 0)
1321 // {
1322 // int ldMS = Util.EnvironmentTickCount();
1323 // UpdateLand();
1324 // landMS = Util.EnvironmentTickCountSubtract(ldMS);
1325 // }
1326
1294 if (Frame % m_update_backup == 0) 1327 if (Frame % m_update_backup == 0)
1295 { 1328 {
1296 int backMS = Util.EnvironmentTickCount(); 1329 int backMS = Util.EnvironmentTickCount();
@@ -1392,12 +1425,16 @@ namespace OpenSim.Region.Framework.Scenes
1392 maintc = Util.EnvironmentTickCountSubtract(maintc); 1425 maintc = Util.EnvironmentTickCountSubtract(maintc);
1393 maintc = (int)(MinFrameTime * 1000) - maintc; 1426 maintc = (int)(MinFrameTime * 1000) - maintc;
1394 1427
1428
1429 m_lastUpdate = Util.EnvironmentTickCount();
1430 m_firstHeartbeat = false;
1431
1395 if (maintc > 0) 1432 if (maintc > 0)
1396 Thread.Sleep(maintc); 1433 Thread.Sleep(maintc);
1397 1434
1398 // Tell the watchdog that this thread is still alive 1435 // Tell the watchdog that this thread is still alive
1399 Watchdog.UpdateThread(); 1436 Watchdog.UpdateThread();
1400 } 1437 }
1401 1438
1402 public void AddGroupTarget(SceneObjectGroup grp) 1439 public void AddGroupTarget(SceneObjectGroup grp)
1403 { 1440 {
@@ -1413,9 +1450,9 @@ namespace OpenSim.Region.Framework.Scenes
1413 1450
1414 private void CheckAtTargets() 1451 private void CheckAtTargets()
1415 { 1452 {
1416 Dictionary<UUID, SceneObjectGroup>.ValueCollection objs; 1453 List<SceneObjectGroup> objs = new List<SceneObjectGroup>();
1417 lock (m_groupsWithTargets) 1454 lock (m_groupsWithTargets)
1418 objs = m_groupsWithTargets.Values; 1455 objs = new List<SceneObjectGroup>(m_groupsWithTargets.Values);
1419 1456
1420 foreach (SceneObjectGroup entry in objs) 1457 foreach (SceneObjectGroup entry in objs)
1421 entry.checkAtTargets(); 1458 entry.checkAtTargets();
@@ -1734,14 +1771,24 @@ namespace OpenSim.Region.Framework.Scenes
1734 /// <returns></returns> 1771 /// <returns></returns>
1735 public Vector3 GetNewRezLocation(Vector3 RayStart, Vector3 RayEnd, UUID RayTargetID, Quaternion rot, byte bypassRayCast, byte RayEndIsIntersection, bool frontFacesOnly, Vector3 scale, bool FaceCenter) 1772 public Vector3 GetNewRezLocation(Vector3 RayStart, Vector3 RayEnd, UUID RayTargetID, Quaternion rot, byte bypassRayCast, byte RayEndIsIntersection, bool frontFacesOnly, Vector3 scale, bool FaceCenter)
1736 { 1773 {
1774
1775 float wheight = (float)RegionInfo.RegionSettings.WaterHeight;
1776 Vector3 wpos = Vector3.Zero;
1777 // Check for water surface intersection from above
1778 if ( (RayStart.Z > wheight) && (RayEnd.Z < wheight) )
1779 {
1780 float ratio = (RayStart.Z - wheight) / (RayStart.Z - RayEnd.Z);
1781 wpos.X = RayStart.X - (ratio * (RayStart.X - RayEnd.X));
1782 wpos.Y = RayStart.Y - (ratio * (RayStart.Y - RayEnd.Y));
1783 wpos.Z = wheight;
1784 }
1785
1737 Vector3 pos = Vector3.Zero; 1786 Vector3 pos = Vector3.Zero;
1738 if (RayEndIsIntersection == (byte)1) 1787 if (RayEndIsIntersection == (byte)1)
1739 { 1788 {
1740 pos = RayEnd; 1789 pos = RayEnd;
1741 return pos;
1742 } 1790 }
1743 1791 else if (RayTargetID != UUID.Zero)
1744 if (RayTargetID != UUID.Zero)
1745 { 1792 {
1746 SceneObjectPart target = GetSceneObjectPart(RayTargetID); 1793 SceneObjectPart target = GetSceneObjectPart(RayTargetID);
1747 1794
@@ -1763,7 +1810,7 @@ namespace OpenSim.Region.Framework.Scenes
1763 EntityIntersection ei = target.TestIntersectionOBB(NewRay, Quaternion.Identity, frontFacesOnly, FaceCenter); 1810 EntityIntersection ei = target.TestIntersectionOBB(NewRay, Quaternion.Identity, frontFacesOnly, FaceCenter);
1764 1811
1765 // Un-comment out the following line to Get Raytrace results printed to the console. 1812 // Un-comment out the following line to Get Raytrace results printed to the console.
1766 // m_log.Info("[RAYTRACERESULTS]: Hit:" + ei.HitTF.ToString() + " Point: " + ei.ipoint.ToString() + " Normal: " + ei.normal.ToString()); 1813 // m_log.Info("[RAYTRACERESULTS]: Hit:" + ei.HitTF.ToString() + " Point: " + ei.ipoint.ToString() + " Normal: " + ei.normal.ToString());
1767 float ScaleOffset = 0.5f; 1814 float ScaleOffset = 0.5f;
1768 1815
1769 // If we hit something 1816 // If we hit something
@@ -1786,13 +1833,10 @@ namespace OpenSim.Region.Framework.Scenes
1786 //pos.Z -= 0.25F; 1833 //pos.Z -= 0.25F;
1787 1834
1788 } 1835 }
1789
1790 return pos;
1791 } 1836 }
1792 else 1837 else
1793 { 1838 {
1794 // We don't have a target here, so we're going to raytrace all the objects in the scene. 1839 // We don't have a target here, so we're going to raytrace all the objects in the scene.
1795
1796 EntityIntersection ei = m_sceneGraph.GetClosestIntersectingPrim(new Ray(AXOrigin, AXdirection), true, false); 1840 EntityIntersection ei = m_sceneGraph.GetClosestIntersectingPrim(new Ray(AXOrigin, AXdirection), true, false);
1797 1841
1798 // Un-comment the following line to print the raytrace results to the console. 1842 // Un-comment the following line to print the raytrace results to the console.
@@ -1801,13 +1845,12 @@ namespace OpenSim.Region.Framework.Scenes
1801 if (ei.HitTF) 1845 if (ei.HitTF)
1802 { 1846 {
1803 pos = new Vector3(ei.ipoint.X, ei.ipoint.Y, ei.ipoint.Z); 1847 pos = new Vector3(ei.ipoint.X, ei.ipoint.Y, ei.ipoint.Z);
1804 } else 1848 }
1849 else
1805 { 1850 {
1806 // fall back to our stupid functionality 1851 // fall back to our stupid functionality
1807 pos = RayEnd; 1852 pos = RayEnd;
1808 } 1853 }
1809
1810 return pos;
1811 } 1854 }
1812 } 1855 }
1813 else 1856 else
@@ -1818,8 +1861,12 @@ namespace OpenSim.Region.Framework.Scenes
1818 //increase height so its above the ground. 1861 //increase height so its above the ground.
1819 //should be getting the normal of the ground at the rez point and using that? 1862 //should be getting the normal of the ground at the rez point and using that?
1820 pos.Z += scale.Z / 2f; 1863 pos.Z += scale.Z / 2f;
1821 return pos; 1864// return pos;
1822 } 1865 }
1866
1867 // check against posible water intercept
1868 if (wpos.Z > pos.Z) pos = wpos;
1869 return pos;
1823 } 1870 }
1824 1871
1825 1872
@@ -1903,7 +1950,10 @@ namespace OpenSim.Region.Framework.Scenes
1903 public bool AddRestoredSceneObject( 1950 public bool AddRestoredSceneObject(
1904 SceneObjectGroup sceneObject, bool attachToBackup, bool alreadyPersisted, bool sendClientUpdates) 1951 SceneObjectGroup sceneObject, bool attachToBackup, bool alreadyPersisted, bool sendClientUpdates)
1905 { 1952 {
1906 return m_sceneGraph.AddRestoredSceneObject(sceneObject, attachToBackup, alreadyPersisted, sendClientUpdates); 1953 bool result = m_sceneGraph.AddRestoredSceneObject(sceneObject, attachToBackup, alreadyPersisted, sendClientUpdates);
1954 if (result)
1955 sceneObject.IsDeleted = false;
1956 return result;
1907 } 1957 }
1908 1958
1909 /// <summary> 1959 /// <summary>
@@ -1993,6 +2043,15 @@ namespace OpenSim.Region.Framework.Scenes
1993 /// </summary> 2043 /// </summary>
1994 public void DeleteAllSceneObjects() 2044 public void DeleteAllSceneObjects()
1995 { 2045 {
2046 DeleteAllSceneObjects(false);
2047 }
2048
2049 /// <summary>
2050 /// Delete every object from the scene. This does not include attachments worn by avatars.
2051 /// </summary>
2052 public void DeleteAllSceneObjects(bool exceptNoCopy)
2053 {
2054 List<SceneObjectGroup> toReturn = new List<SceneObjectGroup>();
1996 lock (Entities) 2055 lock (Entities)
1997 { 2056 {
1998 EntityBase[] entities = Entities.GetEntities(); 2057 EntityBase[] entities = Entities.GetEntities();
@@ -2001,11 +2060,24 @@ namespace OpenSim.Region.Framework.Scenes
2001 if (e is SceneObjectGroup) 2060 if (e is SceneObjectGroup)
2002 { 2061 {
2003 SceneObjectGroup sog = (SceneObjectGroup)e; 2062 SceneObjectGroup sog = (SceneObjectGroup)e;
2004 if (!sog.IsAttachment) 2063 if (sog != null && !sog.IsAttachment)
2005 DeleteSceneObject((SceneObjectGroup)e, false); 2064 {
2065 if (!exceptNoCopy || ((sog.GetEffectivePermissions() & (uint)PermissionMask.Copy) != 0))
2066 {
2067 DeleteSceneObject((SceneObjectGroup)e, false);
2068 }
2069 else
2070 {
2071 toReturn.Add((SceneObjectGroup)e);
2072 }
2073 }
2006 } 2074 }
2007 } 2075 }
2008 } 2076 }
2077 if (toReturn.Count > 0)
2078 {
2079 returnObjects(toReturn.ToArray(), UUID.Zero);
2080 }
2009 } 2081 }
2010 2082
2011 /// <summary> 2083 /// <summary>
@@ -2053,6 +2125,8 @@ namespace OpenSim.Region.Framework.Scenes
2053 } 2125 }
2054 2126
2055 group.DeleteGroupFromScene(silent); 2127 group.DeleteGroupFromScene(silent);
2128 if (!silent)
2129 SendKillObject(new List<uint>() { group.LocalId });
2056 2130
2057// m_log.DebugFormat("[SCENE]: Exit DeleteSceneObject() for {0} {1}", group.Name, group.UUID); 2131// m_log.DebugFormat("[SCENE]: Exit DeleteSceneObject() for {0} {1}", group.Name, group.UUID);
2058 } 2132 }
@@ -2407,10 +2481,17 @@ namespace OpenSim.Region.Framework.Scenes
2407 /// <returns>True if the SceneObjectGroup was added, False if it was not</returns> 2481 /// <returns>True if the SceneObjectGroup was added, False if it was not</returns>
2408 public bool AddSceneObject(SceneObjectGroup sceneObject) 2482 public bool AddSceneObject(SceneObjectGroup sceneObject)
2409 { 2483 {
2484 if (sceneObject.OwnerID == UUID.Zero)
2485 {
2486 m_log.ErrorFormat("[SCENE]: Owner ID for {0} was zero", sceneObject.UUID);
2487 return false;
2488 }
2489
2410 // If the user is banned, we won't let any of their objects 2490 // If the user is banned, we won't let any of their objects
2411 // enter. Period. 2491 // enter. Period.
2412 // 2492 //
2413 if (m_regInfo.EstateSettings.IsBanned(sceneObject.OwnerID)) 2493 int flags = GetUserFlags(sceneObject.OwnerID);
2494 if (m_regInfo.EstateSettings.IsBanned(sceneObject.OwnerID, flags))
2414 { 2495 {
2415 m_log.Info("[INTERREGION]: Denied prim crossing for " + 2496 m_log.Info("[INTERREGION]: Denied prim crossing for " +
2416 "banned avatar"); 2497 "banned avatar");
@@ -2457,12 +2538,23 @@ namespace OpenSim.Region.Framework.Scenes
2457 } 2538 }
2458 else 2539 else
2459 { 2540 {
2541 m_log.DebugFormat("[SCENE]: Attachment {0} arrived and scene presence was not found, setting to temp", sceneObject.UUID);
2460 RootPrim.RemFlag(PrimFlags.TemporaryOnRez); 2542 RootPrim.RemFlag(PrimFlags.TemporaryOnRez);
2461 RootPrim.AddFlag(PrimFlags.TemporaryOnRez); 2543 RootPrim.AddFlag(PrimFlags.TemporaryOnRez);
2462 } 2544 }
2545 if (sceneObject.OwnerID == UUID.Zero)
2546 {
2547 m_log.ErrorFormat("[SCENE]: Owner ID for {0} was zero after attachment processing. BUG!", sceneObject.UUID);
2548 return false;
2549 }
2463 } 2550 }
2464 else 2551 else
2465 { 2552 {
2553 if (sceneObject.OwnerID == UUID.Zero)
2554 {
2555 m_log.ErrorFormat("[SCENE]: Owner ID for non-attachment {0} was zero", sceneObject.UUID);
2556 return false;
2557 }
2466 AddRestoredSceneObject(sceneObject, true, false); 2558 AddRestoredSceneObject(sceneObject, true, false);
2467 2559
2468 if (!Permissions.CanObjectEntry(sceneObject.UUID, 2560 if (!Permissions.CanObjectEntry(sceneObject.UUID,
@@ -2492,6 +2584,24 @@ namespace OpenSim.Region.Framework.Scenes
2492 return 2; // StateSource.PrimCrossing 2584 return 2; // StateSource.PrimCrossing
2493 } 2585 }
2494 2586
2587 public int GetUserFlags(UUID user)
2588 {
2589 //Unfortunately the SP approach means that the value is cached until region is restarted
2590 /*
2591 ScenePresence sp;
2592 if (TryGetScenePresence(user, out sp))
2593 {
2594 return sp.UserFlags;
2595 }
2596 else
2597 {
2598 */
2599 UserAccount uac = UserAccountService.GetUserAccount(RegionInfo.ScopeID, user);
2600 if (uac == null)
2601 return 0;
2602 return uac.UserFlags;
2603 //}
2604 }
2495 #endregion 2605 #endregion
2496 2606
2497 #region Add/Remove Avatar Methods 2607 #region Add/Remove Avatar Methods
@@ -2513,6 +2623,7 @@ namespace OpenSim.Region.Framework.Scenes
2513 (aCircuit.teleportFlags & (uint)Constants.TeleportFlags.ViaLogin) != 0; 2623 (aCircuit.teleportFlags & (uint)Constants.TeleportFlags.ViaLogin) != 0;
2514 2624
2515 CheckHeartbeat(); 2625 CheckHeartbeat();
2626 ScenePresence presence;
2516 2627
2517 if (GetScenePresence(client.AgentId) == null) // ensure there is no SP here 2628 if (GetScenePresence(client.AgentId) == null) // ensure there is no SP here
2518 { 2629 {
@@ -2548,7 +2659,14 @@ namespace OpenSim.Region.Framework.Scenes
2548 2659
2549 EventManager.TriggerOnNewClient(client); 2660 EventManager.TriggerOnNewClient(client);
2550 if (vialogin) 2661 if (vialogin)
2662 {
2551 EventManager.TriggerOnClientLogin(client); 2663 EventManager.TriggerOnClientLogin(client);
2664
2665 // Send initial parcel data
2666 Vector3 pos = createdSp.AbsolutePosition;
2667 ILandObject land = LandChannel.GetLandObject(pos.X, pos.Y);
2668 land.SendLandUpdateToClient(client);
2669 }
2552 } 2670 }
2553 } 2671 }
2554 2672
@@ -2637,19 +2755,12 @@ namespace OpenSim.Region.Framework.Scenes
2637 // and the scene presence and the client, if they exist 2755 // and the scene presence and the client, if they exist
2638 try 2756 try
2639 { 2757 {
2640 // We need to wait for the client to make UDP contact first. 2758 ScenePresence sp = GetScenePresence(agentID);
2641 // It's the UDP contact that creates the scene presence 2759 PresenceService.LogoutAgent(sp.ControllingClient.SessionId);
2642 ScenePresence sp = WaitGetScenePresence(agentID); 2760
2643 if (sp != null) 2761 if (sp != null)
2644 {
2645 PresenceService.LogoutAgent(sp.ControllingClient.SessionId);
2646
2647 sp.ControllingClient.Close(); 2762 sp.ControllingClient.Close();
2648 } 2763
2649 else
2650 {
2651 m_log.WarnFormat("[SCENE]: Could not find scene presence for {0}", agentID);
2652 }
2653 // BANG! SLASH! 2764 // BANG! SLASH!
2654 m_authenticateHandler.RemoveCircuit(agentID); 2765 m_authenticateHandler.RemoveCircuit(agentID);
2655 2766
@@ -2749,6 +2860,7 @@ namespace OpenSim.Region.Framework.Scenes
2749 client.OnFetchInventory += m_asyncInventorySender.HandleFetchInventory; 2860 client.OnFetchInventory += m_asyncInventorySender.HandleFetchInventory;
2750 client.OnUpdateInventoryItem += UpdateInventoryItemAsset; 2861 client.OnUpdateInventoryItem += UpdateInventoryItemAsset;
2751 client.OnCopyInventoryItem += CopyInventoryItem; 2862 client.OnCopyInventoryItem += CopyInventoryItem;
2863 client.OnMoveItemsAndLeaveCopy += MoveInventoryItemsLeaveCopy;
2752 client.OnMoveInventoryItem += MoveInventoryItem; 2864 client.OnMoveInventoryItem += MoveInventoryItem;
2753 client.OnRemoveInventoryItem += RemoveInventoryItem; 2865 client.OnRemoveInventoryItem += RemoveInventoryItem;
2754 client.OnRemoveInventoryFolder += RemoveInventoryFolder; 2866 client.OnRemoveInventoryFolder += RemoveInventoryFolder;
@@ -2926,15 +3038,16 @@ namespace OpenSim.Region.Framework.Scenes
2926 /// </summary> 3038 /// </summary>
2927 /// <param name="agentId">The avatar's Unique ID</param> 3039 /// <param name="agentId">The avatar's Unique ID</param>
2928 /// <param name="client">The IClientAPI for the client</param> 3040 /// <param name="client">The IClientAPI for the client</param>
2929 public virtual void TeleportClientHome(UUID agentId, IClientAPI client) 3041 public virtual bool TeleportClientHome(UUID agentId, IClientAPI client)
2930 { 3042 {
2931 if (m_teleportModule != null) 3043 if (m_teleportModule != null)
2932 m_teleportModule.TeleportHome(agentId, client); 3044 return m_teleportModule.TeleportHome(agentId, client);
2933 else 3045 else
2934 { 3046 {
2935 m_log.DebugFormat("[SCENE]: Unable to teleport user home: no AgentTransferModule is active"); 3047 m_log.DebugFormat("[SCENE]: Unable to teleport user home: no AgentTransferModule is active");
2936 client.SendTeleportFailed("Unable to perform teleports on this simulator."); 3048 client.SendTeleportFailed("Unable to perform teleports on this simulator.");
2937 } 3049 }
3050 return false;
2938 } 3051 }
2939 3052
2940 /// <summary> 3053 /// <summary>
@@ -3026,6 +3139,16 @@ namespace OpenSim.Region.Framework.Scenes
3026 /// <param name="flags"></param> 3139 /// <param name="flags"></param>
3027 public virtual void SetHomeRezPoint(IClientAPI remoteClient, ulong regionHandle, Vector3 position, Vector3 lookAt, uint flags) 3140 public virtual void SetHomeRezPoint(IClientAPI remoteClient, ulong regionHandle, Vector3 position, Vector3 lookAt, uint flags)
3028 { 3141 {
3142 //Add half the avatar's height so that the user doesn't fall through prims
3143 ScenePresence presence;
3144 if (TryGetScenePresence(remoteClient.AgentId, out presence))
3145 {
3146 if (presence.Appearance != null)
3147 {
3148 position.Z = position.Z + (presence.Appearance.AvatarHeight / 2);
3149 }
3150 }
3151
3029 if (GridUserService != null && GridUserService.SetHome(remoteClient.AgentId.ToString(), RegionInfo.RegionID, position, lookAt)) 3152 if (GridUserService != null && GridUserService.SetHome(remoteClient.AgentId.ToString(), RegionInfo.RegionID, position, lookAt))
3030 // FUBAR ALERT: this needs to be "Home position set." so the viewer saves a home-screenshot. 3153 // FUBAR ALERT: this needs to be "Home position set." so the viewer saves a home-screenshot.
3031 m_dialogModule.SendAlertToUser(remoteClient, "Home position set."); 3154 m_dialogModule.SendAlertToUser(remoteClient, "Home position set.");
@@ -3094,8 +3217,9 @@ namespace OpenSim.Region.Framework.Scenes
3094 regions.Remove(RegionInfo.RegionHandle); 3217 regions.Remove(RegionInfo.RegionHandle);
3095 m_sceneGridService.SendCloseChildAgentConnections(agentID, regions); 3218 m_sceneGridService.SendCloseChildAgentConnections(agentID, regions);
3096 } 3219 }
3097 3220 m_log.Debug("[Scene] Beginning ClientClosed");
3098 m_eventManager.TriggerClientClosed(agentID, this); 3221 m_eventManager.TriggerClientClosed(agentID, this);
3222 m_log.Debug("[Scene] Finished ClientClosed");
3099 } 3223 }
3100 catch (NullReferenceException) 3224 catch (NullReferenceException)
3101 { 3225 {
@@ -3103,7 +3227,12 @@ namespace OpenSim.Region.Framework.Scenes
3103 // Avatar is already disposed :/ 3227 // Avatar is already disposed :/
3104 } 3228 }
3105 3229
3230 m_log.Debug("[Scene] Beginning OnRemovePresence");
3106 m_eventManager.TriggerOnRemovePresence(agentID); 3231 m_eventManager.TriggerOnRemovePresence(agentID);
3232 m_log.Debug("[Scene] Finished OnRemovePresence");
3233
3234 if (AttachmentsModule != null && !avatar.IsChildAgent && avatar.PresenceType != PresenceType.Npc)
3235 AttachmentsModule.SaveChangedAttachments(avatar);
3107 3236
3108 if (AttachmentsModule != null && !avatar.IsChildAgent && avatar.PresenceType != PresenceType.Npc) 3237 if (AttachmentsModule != null && !avatar.IsChildAgent && avatar.PresenceType != PresenceType.Npc)
3109 AttachmentsModule.SaveChangedAttachments(avatar); 3238 AttachmentsModule.SaveChangedAttachments(avatar);
@@ -3112,7 +3241,7 @@ namespace OpenSim.Region.Framework.Scenes
3112 delegate(IClientAPI client) 3241 delegate(IClientAPI client)
3113 { 3242 {
3114 //We can safely ignore null reference exceptions. It means the avatar is dead and cleaned up anyway 3243 //We can safely ignore null reference exceptions. It means the avatar is dead and cleaned up anyway
3115 try { client.SendKillObject(avatar.RegionHandle, avatar.LocalId); } 3244 try { client.SendKillObject(avatar.RegionHandle, new List<uint>() { avatar.LocalId}); }
3116 catch (NullReferenceException) { } 3245 catch (NullReferenceException) { }
3117 }); 3246 });
3118 3247
@@ -3123,8 +3252,11 @@ namespace OpenSim.Region.Framework.Scenes
3123 } 3252 }
3124 3253
3125 // Remove the avatar from the scene 3254 // Remove the avatar from the scene
3255 m_log.Debug("[Scene] Begin RemoveScenePresence");
3126 m_sceneGraph.RemoveScenePresence(agentID); 3256 m_sceneGraph.RemoveScenePresence(agentID);
3257 m_log.Debug("[Scene] Finished RemoveScenePresence. Removing the client manager");
3127 m_clientManager.Remove(agentID); 3258 m_clientManager.Remove(agentID);
3259 m_log.Debug("[Scene] Removed the client manager. Firing avatar.close");
3128 3260
3129 try 3261 try
3130 { 3262 {
@@ -3138,9 +3270,10 @@ namespace OpenSim.Region.Framework.Scenes
3138 { 3270 {
3139 m_log.Error("[SCENE] Scene.cs:RemoveClient exception: " + e.ToString()); 3271 m_log.Error("[SCENE] Scene.cs:RemoveClient exception: " + e.ToString());
3140 } 3272 }
3141 3273 m_log.Debug("[Scene] Done. Firing RemoveCircuit");
3142 m_authenticateHandler.RemoveCircuit(avatar.ControllingClient.CircuitCode); 3274 m_authenticateHandler.RemoveCircuit(avatar.ControllingClient.CircuitCode);
3143// CleanDroppedAttachments(); 3275// CleanDroppedAttachments();
3276 m_log.Debug("[Scene] The avatar has left the building");
3144 //m_log.InfoFormat("[SCENE] Memory pre GC {0}", System.GC.GetTotalMemory(false)); 3277 //m_log.InfoFormat("[SCENE] Memory pre GC {0}", System.GC.GetTotalMemory(false));
3145 //m_log.InfoFormat("[SCENE] Memory post GC {0}", System.GC.GetTotalMemory(true)); 3278 //m_log.InfoFormat("[SCENE] Memory post GC {0}", System.GC.GetTotalMemory(true));
3146 } 3279 }
@@ -3171,19 +3304,24 @@ namespace OpenSim.Region.Framework.Scenes
3171 3304
3172 #region Entities 3305 #region Entities
3173 3306
3174 public void SendKillObject(uint localID) 3307 public void SendKillObject(List<uint> localIDs)
3175 { 3308 {
3176 SceneObjectPart part = GetSceneObjectPart(localID); 3309 List<uint> deleteIDs = new List<uint>();
3177 if (part != null) // It is a prim 3310
3311 foreach (uint localID in localIDs)
3178 { 3312 {
3179 if (!part.ParentGroup.IsDeleted) // Valid 3313 SceneObjectPart part = GetSceneObjectPart(localID);
3314 if (part != null) // It is a prim
3180 { 3315 {
3181 if (part.ParentGroup.RootPart != part) // Child part 3316 if (part.ParentGroup != null && !part.ParentGroup.IsDeleted) // Valid
3182 return; 3317 {
3318 if (part.ParentGroup.RootPart != part) // Child part
3319 continue;
3320 }
3183 } 3321 }
3322 deleteIDs.Add(localID);
3184 } 3323 }
3185 3324 ForEachClient(delegate(IClientAPI client) { client.SendKillObject(m_regionHandle, deleteIDs); });
3186 ForEachClient(delegate(IClientAPI client) { client.SendKillObject(m_regionHandle, localID); });
3187 } 3325 }
3188 3326
3189 #endregion 3327 #endregion
@@ -3201,7 +3339,6 @@ namespace OpenSim.Region.Framework.Scenes
3201 //m_sceneGridService.OnChildAgentUpdate += IncomingChildAgentDataUpdate; 3339 //m_sceneGridService.OnChildAgentUpdate += IncomingChildAgentDataUpdate;
3202 //m_sceneGridService.OnRemoveKnownRegionFromAvatar += HandleRemoveKnownRegionsFromAvatar; 3340 //m_sceneGridService.OnRemoveKnownRegionFromAvatar += HandleRemoveKnownRegionsFromAvatar;
3203 m_sceneGridService.OnLogOffUser += HandleLogOffUserFromGrid; 3341 m_sceneGridService.OnLogOffUser += HandleLogOffUserFromGrid;
3204 m_sceneGridService.KiPrimitive += SendKillObject;
3205 m_sceneGridService.OnGetLandData += GetLandData; 3342 m_sceneGridService.OnGetLandData += GetLandData;
3206 } 3343 }
3207 3344
@@ -3210,7 +3347,6 @@ namespace OpenSim.Region.Framework.Scenes
3210 /// </summary> 3347 /// </summary>
3211 public void UnRegisterRegionWithComms() 3348 public void UnRegisterRegionWithComms()
3212 { 3349 {
3213 m_sceneGridService.KiPrimitive -= SendKillObject;
3214 m_sceneGridService.OnLogOffUser -= HandleLogOffUserFromGrid; 3350 m_sceneGridService.OnLogOffUser -= HandleLogOffUserFromGrid;
3215 //m_sceneGridService.OnRemoveKnownRegionFromAvatar -= HandleRemoveKnownRegionsFromAvatar; 3351 //m_sceneGridService.OnRemoveKnownRegionFromAvatar -= HandleRemoveKnownRegionsFromAvatar;
3216 //m_sceneGridService.OnChildAgentUpdate -= IncomingChildAgentDataUpdate; 3352 //m_sceneGridService.OnChildAgentUpdate -= IncomingChildAgentDataUpdate;
@@ -3290,13 +3426,16 @@ namespace OpenSim.Region.Framework.Scenes
3290 sp = null; 3426 sp = null;
3291 } 3427 }
3292 3428
3293 ILandObject land = LandChannel.GetLandObject(agent.startpos.X, agent.startpos.Y);
3294 3429
3295 //On login test land permisions 3430 //On login test land permisions
3296 if (vialogin) 3431 if (vialogin)
3297 { 3432 {
3298 if (land != null && !TestLandRestrictions(agent, land, out reason)) 3433 IUserAccountCacheModule cache = RequestModuleInterface<IUserAccountCacheModule>();
3434 if (cache != null)
3435 cache.Remove(agent.firstname + " " + agent.lastname);
3436 if (!TestLandRestrictions(agent.AgentID, out reason, ref agent.startpos.X, ref agent.startpos.Y))
3299 { 3437 {
3438 m_log.DebugFormat("[CONNECTION BEGIN]: Denying access to {0} due to no land access", agent.AgentID.ToString());
3300 return false; 3439 return false;
3301 } 3440 }
3302 } 3441 }
@@ -3319,8 +3458,13 @@ namespace OpenSim.Region.Framework.Scenes
3319 3458
3320 try 3459 try
3321 { 3460 {
3322 if (!AuthorizeUser(agent, out reason)) 3461 // Always check estate if this is a login. Always
3323 return false; 3462 // check if banned regions are to be blacked out.
3463 if (vialogin || (!m_seeIntoBannedRegion))
3464 {
3465 if (!AuthorizeUser(agent, out reason))
3466 return false;
3467 }
3324 } 3468 }
3325 catch (Exception e) 3469 catch (Exception e)
3326 { 3470 {
@@ -3422,6 +3566,8 @@ namespace OpenSim.Region.Framework.Scenes
3422 } 3566 }
3423 } 3567 }
3424 // Honor parcel landing type and position. 3568 // Honor parcel landing type and position.
3569 /*
3570 ILandObject land = LandChannel.GetLandObject(agent.startpos.X, agent.startpos.Y);
3425 if (land != null) 3571 if (land != null)
3426 { 3572 {
3427 if (land.LandData.LandingType == (byte)1 && land.LandData.UserLocation != Vector3.Zero) 3573 if (land.LandData.LandingType == (byte)1 && land.LandData.UserLocation != Vector3.Zero)
@@ -3429,26 +3575,34 @@ namespace OpenSim.Region.Framework.Scenes
3429 agent.startpos = land.LandData.UserLocation; 3575 agent.startpos = land.LandData.UserLocation;
3430 } 3576 }
3431 } 3577 }
3578 */// This is now handled properly in ScenePresence.MakeRootAgent
3432 } 3579 }
3433 3580
3434 return true; 3581 return true;
3435 } 3582 }
3436 3583
3437 private bool TestLandRestrictions(AgentCircuitData agent, ILandObject land, out string reason) 3584 private bool TestLandRestrictions(UUID agentID, out string reason, ref float posX, ref float posY)
3438 { 3585 {
3439 3586 reason = String.Empty;
3440 bool banned = land.IsBannedFromLand(agent.AgentID); 3587 if (Permissions.IsGod(agentID))
3441 bool restricted = land.IsRestrictedFromLand(agent.AgentID); 3588 return true;
3589
3590 ILandObject land = LandChannel.GetLandObject(posX, posY);
3591 if (land == null)
3592 return false;
3593
3594 bool banned = land.IsBannedFromLand(agentID);
3595 bool restricted = land.IsRestrictedFromLand(agentID);
3442 3596
3443 if (banned || restricted) 3597 if (banned || restricted)
3444 { 3598 {
3445 ILandObject nearestParcel = GetNearestAllowedParcel(agent.AgentID, agent.startpos.X, agent.startpos.Y); 3599 ILandObject nearestParcel = GetNearestAllowedParcel(agentID, posX, posY);
3446 if (nearestParcel != null) 3600 if (nearestParcel != null)
3447 { 3601 {
3448 //Move agent to nearest allowed 3602 //Move agent to nearest allowed
3449 Vector3 newPosition = GetParcelCenterAtGround(nearestParcel); 3603 Vector3 newPosition = GetParcelCenterAtGround(nearestParcel);
3450 agent.startpos.X = newPosition.X; 3604 posX = newPosition.X;
3451 agent.startpos.Y = newPosition.Y; 3605 posY = newPosition.Y;
3452 } 3606 }
3453 else 3607 else
3454 { 3608 {
@@ -3510,7 +3664,7 @@ namespace OpenSim.Region.Framework.Scenes
3510 3664
3511 if (!m_strictAccessControl) return true; 3665 if (!m_strictAccessControl) return true;
3512 if (Permissions.IsGod(agent.AgentID)) return true; 3666 if (Permissions.IsGod(agent.AgentID)) return true;
3513 3667
3514 if (AuthorizationService != null) 3668 if (AuthorizationService != null)
3515 { 3669 {
3516 if (!AuthorizationService.IsAuthorizedForRegion( 3670 if (!AuthorizationService.IsAuthorizedForRegion(
@@ -3518,14 +3672,14 @@ namespace OpenSim.Region.Framework.Scenes
3518 { 3672 {
3519 m_log.WarnFormat("[CONNECTION BEGIN]: Denied access to: {0} ({1} {2}) at {3} because the user does not have access to the region", 3673 m_log.WarnFormat("[CONNECTION BEGIN]: Denied access to: {0} ({1} {2}) at {3} because the user does not have access to the region",
3520 agent.AgentID, agent.firstname, agent.lastname, RegionInfo.RegionName); 3674 agent.AgentID, agent.firstname, agent.lastname, RegionInfo.RegionName);
3521 3675
3522 return false; 3676 return false;
3523 } 3677 }
3524 } 3678 }
3525 3679
3526 if (m_regInfo.EstateSettings != null) 3680 if (m_regInfo.EstateSettings != null)
3527 { 3681 {
3528 if (m_regInfo.EstateSettings.IsBanned(agent.AgentID)) 3682 if (m_regInfo.EstateSettings.IsBanned(agent.AgentID,0))
3529 { 3683 {
3530 m_log.WarnFormat("[CONNECTION BEGIN]: Denied access to: {0} ({1} {2}) at {3} because the user is on the banlist", 3684 m_log.WarnFormat("[CONNECTION BEGIN]: Denied access to: {0} ({1} {2}) at {3} because the user is on the banlist",
3531 agent.AgentID, agent.firstname, agent.lastname, RegionInfo.RegionName); 3685 agent.AgentID, agent.firstname, agent.lastname, RegionInfo.RegionName);
@@ -3715,6 +3869,13 @@ namespace OpenSim.Region.Framework.Scenes
3715 3869
3716 // We have to wait until the viewer contacts this region after receiving EAC. 3870 // We have to wait until the viewer contacts this region after receiving EAC.
3717 // That calls AddNewClient, which finally creates the ScenePresence 3871 // That calls AddNewClient, which finally creates the ScenePresence
3872 int flags = GetUserFlags(cAgentData.AgentID);
3873 if (m_regInfo.EstateSettings.IsBanned(cAgentData.AgentID, flags))
3874 {
3875 m_log.DebugFormat("[SCENE]: Denying root agent entry to {0}: banned", cAgentData.AgentID);
3876 return false;
3877 }
3878
3718 ILandObject nearestParcel = GetNearestAllowedParcel(cAgentData.AgentID, Constants.RegionSize / 2, Constants.RegionSize / 2); 3879 ILandObject nearestParcel = GetNearestAllowedParcel(cAgentData.AgentID, Constants.RegionSize / 2, Constants.RegionSize / 2);
3719 if (nearestParcel == null) 3880 if (nearestParcel == null)
3720 { 3881 {
@@ -3730,7 +3891,6 @@ namespace OpenSim.Region.Framework.Scenes
3730 return false; 3891 return false;
3731 } 3892 }
3732 3893
3733
3734 ScenePresence childAgentUpdate = WaitGetScenePresence(cAgentData.AgentID); 3894 ScenePresence childAgentUpdate = WaitGetScenePresence(cAgentData.AgentID);
3735 3895
3736 if (childAgentUpdate != null) 3896 if (childAgentUpdate != null)
@@ -3797,12 +3957,22 @@ namespace OpenSim.Region.Framework.Scenes
3797 return false; 3957 return false;
3798 } 3958 }
3799 3959
3960 public bool IncomingCloseAgent(UUID agentID)
3961 {
3962 return IncomingCloseAgent(agentID, false);
3963 }
3964
3965 public bool IncomingCloseChildAgent(UUID agentID)
3966 {
3967 return IncomingCloseAgent(agentID, true);
3968 }
3969
3800 /// <summary> 3970 /// <summary>
3801 /// Tell a single agent to disconnect from the region. 3971 /// Tell a single agent to disconnect from the region.
3802 /// </summary> 3972 /// </summary>
3803 /// <param name="regionHandle"></param>
3804 /// <param name="agentID"></param> 3973 /// <param name="agentID"></param>
3805 public bool IncomingCloseAgent(UUID agentID) 3974 /// <param name="childOnly"></param>
3975 public bool IncomingCloseAgent(UUID agentID, bool childOnly)
3806 { 3976 {
3807 //m_log.DebugFormat("[SCENE]: Processing incoming close agent for {0}", agentID); 3977 //m_log.DebugFormat("[SCENE]: Processing incoming close agent for {0}", agentID);
3808 3978
@@ -3814,7 +3984,7 @@ namespace OpenSim.Region.Framework.Scenes
3814 { 3984 {
3815 m_sceneGraph.removeUserCount(false); 3985 m_sceneGraph.removeUserCount(false);
3816 } 3986 }
3817 else 3987 else if (!childOnly)
3818 { 3988 {
3819 m_sceneGraph.removeUserCount(true); 3989 m_sceneGraph.removeUserCount(true);
3820 } 3990 }
@@ -3830,9 +4000,12 @@ namespace OpenSim.Region.Framework.Scenes
3830 } 4000 }
3831 else 4001 else
3832 presence.ControllingClient.SendShutdownConnectionNotice(); 4002 presence.ControllingClient.SendShutdownConnectionNotice();
4003 presence.ControllingClient.Close(false);
4004 }
4005 else if (!childOnly)
4006 {
4007 presence.ControllingClient.Close(true);
3833 } 4008 }
3834
3835 presence.ControllingClient.Close();
3836 return true; 4009 return true;
3837 } 4010 }
3838 4011
@@ -4433,34 +4606,66 @@ namespace OpenSim.Region.Framework.Scenes
4433 SimulationDataService.RemoveObject(uuid, m_regInfo.RegionID); 4606 SimulationDataService.RemoveObject(uuid, m_regInfo.RegionID);
4434 } 4607 }
4435 4608
4436 public int GetHealth() 4609 public int GetHealth(out int flags, out string message)
4437 { 4610 {
4438 // Returns: 4611 // Returns:
4439 // 1 = sim is up and accepting http requests. The heartbeat has 4612 // 1 = sim is up and accepting http requests. The heartbeat has
4440 // stopped and the sim is probably locked up, but a remote 4613 // stopped and the sim is probably locked up, but a remote
4441 // admin restart may succeed 4614 // admin restart may succeed
4442 // 4615 //
4443 // 2 = Sim is up and the heartbeat is running. The sim is likely 4616 // 2 = Sim is up and the heartbeat is running. The sim is likely
4444 // usable for people within and logins _may_ work 4617 // usable for people within
4445 // 4618 //
4446 // 3 = We have seen a new user enter within the past 4 minutes 4619 // 3 = Sim is up and one packet thread is running. Sim is
4620 // unstable and will not accept new logins
4621 //
4622 // 4 = Sim is up and both packet threads are running. Sim is
4623 // likely usable
4624 //
4625 // 5 = We have seen a new user enter within the past 4 minutes
4447 // which can be seen as positive confirmation of sim health 4626 // which can be seen as positive confirmation of sim health
4448 // 4627 //
4628
4629 flags = 0;
4630 message = String.Empty;
4631
4632 CheckHeartbeat();
4633
4634 if (m_firstHeartbeat || (m_lastIncoming == 0 && m_lastOutgoing == 0))
4635 {
4636 // We're still starting
4637 // 0 means "in startup", it can't happen another way, since
4638 // to get here, we must be able to accept http connections
4639 return 0;
4640 }
4641
4449 int health=1; // Start at 1, means we're up 4642 int health=1; // Start at 1, means we're up
4450 4643
4451 if ((Util.EnvironmentTickCountSubtract(m_lastUpdate)) < 1000) 4644 if (Util.EnvironmentTickCountSubtract(m_lastUpdate) < 1000)
4645 {
4452 health+=1; 4646 health+=1;
4453 else 4647 flags |= 1;
4648 }
4649
4650 if (Util.EnvironmentTickCountSubtract(m_lastIncoming) < 1000)
4651 {
4652 health+=1;
4653 flags |= 2;
4654 }
4655
4656 if (Util.EnvironmentTickCountSubtract(m_lastOutgoing) < 1000)
4657 {
4658 health+=1;
4659 flags |= 4;
4660 }
4661
4662 if (flags != 7)
4454 return health; 4663 return health;
4455 4664
4456 // A login in the last 4 mins? We can't be doing too badly 4665 // A login in the last 4 mins? We can't be doing too badly
4457 // 4666 //
4458 if ((Util.EnvironmentTickCountSubtract(m_LastLogin)) < 240000) 4667 if (Util.EnvironmentTickCountSubtract(m_LastLogin) < 240000)
4459 health++; 4668 health++;
4460 else
4461 return health;
4462
4463 CheckHeartbeat();
4464 4669
4465 return health; 4670 return health;
4466 } 4671 }
@@ -4653,7 +4858,7 @@ namespace OpenSim.Region.Framework.Scenes
4653 if (m_firstHeartbeat) 4858 if (m_firstHeartbeat)
4654 return; 4859 return;
4655 4860
4656 if (Util.EnvironmentTickCountSubtract(m_lastUpdate) > 2000) 4861 if (Util.EnvironmentTickCountSubtract(m_lastUpdate) > 5000)
4657 StartTimer(); 4862 StartTimer();
4658 } 4863 }
4659 4864
@@ -5067,6 +5272,54 @@ namespace OpenSim.Region.Framework.Scenes
5067 } 5272 }
5068 } 5273 }
5069 5274
5275// public void CleanDroppedAttachments()
5276// {
5277// List<SceneObjectGroup> objectsToDelete =
5278// new List<SceneObjectGroup>();
5279//
5280// lock (m_cleaningAttachments)
5281// {
5282// ForEachSOG(delegate (SceneObjectGroup grp)
5283// {
5284// if (grp.RootPart.Shape.PCode == 0 && grp.RootPart.Shape.State != 0 && (!objectsToDelete.Contains(grp)))
5285// {
5286// UUID agentID = grp.OwnerID;
5287// if (agentID == UUID.Zero)
5288// {
5289// objectsToDelete.Add(grp);
5290// return;
5291// }
5292//
5293// ScenePresence sp = GetScenePresence(agentID);
5294// if (sp == null)
5295// {
5296// objectsToDelete.Add(grp);
5297// return;
5298// }
5299// }
5300// });
5301// }
5302//
5303// foreach (SceneObjectGroup grp in objectsToDelete)
5304// {
5305// m_log.InfoFormat("[SCENE]: Deleting dropped attachment {0} of user {1}", grp.UUID, grp.OwnerID);
5306// DeleteSceneObject(grp, true);
5307// }
5308// }
5309
5310 public void ThreadAlive(int threadCode)
5311 {
5312 switch(threadCode)
5313 {
5314 case 1: // Incoming
5315 m_lastIncoming = Util.EnvironmentTickCount();
5316 break;
5317 case 2: // Incoming
5318 m_lastOutgoing = Util.EnvironmentTickCount();
5319 break;
5320 }
5321 }
5322
5070 // This method is called across the simulation connector to 5323 // This method is called across the simulation connector to
5071 // determine if a given agent is allowed in this region 5324 // determine if a given agent is allowed in this region
5072 // AS A ROOT AGENT. Returning false here will prevent them 5325 // AS A ROOT AGENT. Returning false here will prevent them
@@ -5075,6 +5328,14 @@ namespace OpenSim.Region.Framework.Scenes
5075 // child agent creation, thereby emulating the SL behavior. 5328 // child agent creation, thereby emulating the SL behavior.
5076 public bool QueryAccess(UUID agentID, Vector3 position, out string reason) 5329 public bool QueryAccess(UUID agentID, Vector3 position, out string reason)
5077 { 5330 {
5331 reason = "You are banned from the region";
5332
5333 if (Permissions.IsGod(agentID))
5334 {
5335 reason = String.Empty;
5336 return true;
5337 }
5338
5078 int num = m_sceneGraph.GetNumberOfScenePresences(); 5339 int num = m_sceneGraph.GetNumberOfScenePresences();
5079 5340
5080 if (num >= RegionInfo.RegionSettings.AgentLimit) 5341 if (num >= RegionInfo.RegionSettings.AgentLimit)
@@ -5086,11 +5347,82 @@ namespace OpenSim.Region.Framework.Scenes
5086 } 5347 }
5087 } 5348 }
5088 5349
5350 ScenePresence presence = GetScenePresence(agentID);
5351 IClientAPI client = null;
5352 AgentCircuitData aCircuit = null;
5353
5354 if (presence != null)
5355 {
5356 client = presence.ControllingClient;
5357 if (client != null)
5358 aCircuit = client.RequestClientInfo();
5359 }
5360
5361 // We may be called before there is a presence or a client.
5362 // Fake AgentCircuitData to keep IAuthorizationModule smiling
5363 if (client == null)
5364 {
5365 aCircuit = new AgentCircuitData();
5366 aCircuit.AgentID = agentID;
5367 aCircuit.firstname = String.Empty;
5368 aCircuit.lastname = String.Empty;
5369 }
5370
5371 try
5372 {
5373 if (!AuthorizeUser(aCircuit, out reason))
5374 {
5375 // m_log.DebugFormat("[SCENE]: Denying access for {0}", agentID);
5376 return false;
5377 }
5378 }
5379 catch (Exception e)
5380 {
5381 m_log.DebugFormat("[SCENE]: Exception authorizing agent: {0} "+ e.StackTrace, e.Message);
5382 return false;
5383 }
5384
5385 if (position == Vector3.Zero) // Teleport
5386 {
5387 float posX = 128.0f;
5388 float posY = 128.0f;
5389
5390 if (!TestLandRestrictions(agentID, out reason, ref posX, ref posY))
5391 {
5392 // m_log.DebugFormat("[SCENE]: Denying {0} because they are banned on all parcels", agentID);
5393 return false;
5394 }
5395 }
5396 else // Walking
5397 {
5398 ILandObject land = LandChannel.GetLandObject(position.X, position.Y);
5399 if (land == null)
5400 return false;
5401
5402 bool banned = land.IsBannedFromLand(agentID);
5403 bool restricted = land.IsRestrictedFromLand(agentID);
5404
5405 if (banned || restricted)
5406 return false;
5407 }
5408
5089 reason = String.Empty; 5409 reason = String.Empty;
5090 return true; 5410 return true;
5091 } 5411 }
5092 5412
5093 /// <summary> 5413 public void StartTimerWatchdog()
5414 {
5415 m_timerWatchdog.Interval = 1000;
5416 m_timerWatchdog.Elapsed += TimerWatchdog;
5417 m_timerWatchdog.AutoReset = true;
5418 m_timerWatchdog.Start();
5419 }
5420
5421 public void TimerWatchdog(object sender, ElapsedEventArgs e)
5422 {
5423 CheckHeartbeat();
5424 }
5425
5094 /// This method deals with movement when an avatar is automatically moving (but this is distinct from the 5426 /// This method deals with movement when an avatar is automatically moving (but this is distinct from the
5095 /// autopilot that moves an avatar to a sit target!. 5427 /// autopilot that moves an avatar to a sit target!.
5096 /// </summary> 5428 /// </summary>
diff --git a/OpenSim/Region/Framework/Scenes/SceneBase.cs b/OpenSim/Region/Framework/Scenes/SceneBase.cs
index dee2ecb..73e9392 100644
--- a/OpenSim/Region/Framework/Scenes/SceneBase.cs
+++ b/OpenSim/Region/Framework/Scenes/SceneBase.cs
@@ -136,6 +136,8 @@ namespace OpenSim.Region.Framework.Scenes
136 get { return m_permissions; } 136 get { return m_permissions; }
137 } 137 }
138 138
139 protected string m_datastore;
140
139 /* Used by the loadbalancer plugin on GForge */ 141 /* Used by the loadbalancer plugin on GForge */
140 protected RegionStatus m_regStatus; 142 protected RegionStatus m_regStatus;
141 public RegionStatus RegionStatus 143 public RegionStatus RegionStatus
diff --git a/OpenSim/Region/Framework/Scenes/SceneCommunicationService.cs b/OpenSim/Region/Framework/Scenes/SceneCommunicationService.cs
index 7cffa70..fe9fe31 100644
--- a/OpenSim/Region/Framework/Scenes/SceneCommunicationService.cs
+++ b/OpenSim/Region/Framework/Scenes/SceneCommunicationService.cs
@@ -44,8 +44,6 @@ using GridRegion = OpenSim.Services.Interfaces.GridRegion;
44 44
45namespace OpenSim.Region.Framework.Scenes 45namespace OpenSim.Region.Framework.Scenes
46{ 46{
47 public delegate void KiPrimitiveDelegate(uint localID);
48
49 public delegate void RemoveKnownRegionsFromAvatarList(UUID avatarID, List<ulong> regionlst); 47 public delegate void RemoveKnownRegionsFromAvatarList(UUID avatarID, List<ulong> regionlst);
50 48
51 /// <summary> 49 /// <summary>
@@ -113,8 +111,6 @@ namespace OpenSim.Region.Framework.Scenes
113// private LogOffUser handlerLogOffUser = null; 111// private LogOffUser handlerLogOffUser = null;
114// private GetLandData handlerGetLandData = null; // OnGetLandData 112// private GetLandData handlerGetLandData = null; // OnGetLandData
115 113
116 public KiPrimitiveDelegate KiPrimitive;
117
118 public SceneCommunicationService() 114 public SceneCommunicationService()
119 { 115 {
120 } 116 }
@@ -168,7 +164,7 @@ namespace OpenSim.Region.Framework.Scenes
168 164
169 if (neighbour != null) 165 if (neighbour != null)
170 { 166 {
171 m_log.DebugFormat("[INTERGRID]: Successfully informed neighbour {0}-{1} that I'm here", x / Constants.RegionSize, y / Constants.RegionSize); 167 // m_log.DebugFormat("[INTERGRID]: Successfully informed neighbour {0}-{1} that I'm here", x / Constants.RegionSize, y / Constants.RegionSize);
172 m_scene.EventManager.TriggerOnRegionUp(neighbour); 168 m_scene.EventManager.TriggerOnRegionUp(neighbour);
173 } 169 }
174 else 170 else
@@ -183,7 +179,7 @@ namespace OpenSim.Region.Framework.Scenes
183 //m_log.Info("[INTER]: " + debugRegionName + ": SceneCommunicationService: Sending InterRegion Notification that region is up " + region.RegionName); 179 //m_log.Info("[INTER]: " + debugRegionName + ": SceneCommunicationService: Sending InterRegion Notification that region is up " + region.RegionName);
184 180
185 List<GridRegion> neighbours = m_scene.GridService.GetNeighbours(m_scene.RegionInfo.ScopeID, m_scene.RegionInfo.RegionID); 181 List<GridRegion> neighbours = m_scene.GridService.GetNeighbours(m_scene.RegionInfo.ScopeID, m_scene.RegionInfo.RegionID);
186 m_log.DebugFormat("[INTERGRID]: Informing {0} neighbours that this region is up", neighbours.Count); 182 //m_log.DebugFormat("[INTERGRID]: Informing {0} neighbours that this region is up", neighbours.Count);
187 foreach (GridRegion n in neighbours) 183 foreach (GridRegion n in neighbours)
188 { 184 {
189 InformNeighbourThatRegionUpDelegate d = InformNeighboursThatRegionIsUpAsync; 185 InformNeighbourThatRegionUpDelegate d = InformNeighboursThatRegionIsUpAsync;
@@ -259,46 +255,42 @@ namespace OpenSim.Region.Framework.Scenes
259 255
260 } 256 }
261 257
262 //public delegate void SendCloseChildAgentDelegate(UUID agentID, ulong regionHandle); 258 public delegate void SendCloseChildAgentDelegate(UUID agentID, ulong regionHandle);
263 //private void SendCloseChildAgentCompleted(IAsyncResult iar)
264 //{
265 // SendCloseChildAgentDelegate icon = (SendCloseChildAgentDelegate)iar.AsyncState;
266 // icon.EndInvoke(iar);
267 //}
268 259
269 /// <summary> 260 /// <summary>
270 /// Closes a child agent on a given region 261 /// This Closes child agents on neighboring regions
262 /// Calls an asynchronous method to do so.. so it doesn't lag the sim.
271 /// </summary> 263 /// </summary>
272 protected void SendCloseChildAgent(UUID agentID, ulong regionHandle) 264 protected void SendCloseChildAgentAsync(UUID agentID, ulong regionHandle)
273 { 265 {
274 266
275 m_log.Debug("[INTERGRID]: Sending close agent to " + regionHandle); 267 //m_log.Debug("[INTERGRID]: Sending close agent to " + regionHandle);
276 // let's do our best, but there's not much we can do if the neighbour doesn't accept. 268 // let's do our best, but there's not much we can do if the neighbour doesn't accept.
277 269
278 //m_commsProvider.InterRegion.TellRegionToCloseChildConnection(regionHandle, agentID); 270 //m_commsProvider.InterRegion.TellRegionToCloseChildConnection(regionHandle, agentID);
279 uint x = 0, y = 0; 271 uint x = 0, y = 0;
280 Utils.LongToUInts(regionHandle, out x, out y); 272 Utils.LongToUInts(regionHandle, out x, out y);
281 GridRegion destination = m_scene.GridService.GetRegionByPosition(m_regionInfo.ScopeID, (int)x, (int)y); 273 GridRegion destination = m_scene.GridService.GetRegionByPosition(m_regionInfo.ScopeID, (int)x, (int)y);
282 m_scene.SimulationService.CloseAgent(destination, agentID); 274 m_scene.SimulationService.CloseChildAgent(destination, agentID);
275 }
276
277 private void SendCloseChildAgentCompleted(IAsyncResult iar)
278 {
279 SendCloseChildAgentDelegate icon = (SendCloseChildAgentDelegate)iar.AsyncState;
280 icon.EndInvoke(iar);
283 } 281 }
284 282
285 /// <summary>
286 /// Closes a child agents in a collection of regions. Does so asynchronously
287 /// so that the caller doesn't wait.
288 /// </summary>
289 /// <param name="agentID"></param>
290 /// <param name="regionslst"></param>
291 public void SendCloseChildAgentConnections(UUID agentID, List<ulong> regionslst) 283 public void SendCloseChildAgentConnections(UUID agentID, List<ulong> regionslst)
292 { 284 {
293 Util.FireAndForget(delegate 285 foreach (ulong handle in regionslst)
294 { 286 {
295 foreach (ulong handle in regionslst) 287 SendCloseChildAgentDelegate d = SendCloseChildAgentAsync;
296 { 288 d.BeginInvoke(agentID, handle,
297 SendCloseChildAgent(agentID, handle); 289 SendCloseChildAgentCompleted,
298 } 290 d);
299 }); 291 }
300 } 292 }
301 293
302 public List<GridRegion> RequestNamedRegions(string name, int maxNumber) 294 public List<GridRegion> RequestNamedRegions(string name, int maxNumber)
303 { 295 {
304 return m_scene.GridService.GetRegionsByName(UUID.Zero, name, maxNumber); 296 return m_scene.GridService.GetRegionsByName(UUID.Zero, name, maxNumber);
diff --git a/OpenSim/Region/Framework/Scenes/SceneGraph.cs b/OpenSim/Region/Framework/Scenes/SceneGraph.cs
index 1af18e7..a6178e7 100644
--- a/OpenSim/Region/Framework/Scenes/SceneGraph.cs
+++ b/OpenSim/Region/Framework/Scenes/SceneGraph.cs
@@ -43,6 +43,12 @@ namespace OpenSim.Region.Framework.Scenes
43 43
44 public delegate void ObjectDuplicateDelegate(EntityBase original, EntityBase clone); 44 public delegate void ObjectDuplicateDelegate(EntityBase original, EntityBase clone);
45 45
46 public delegate void AttachToBackupDelegate(SceneObjectGroup sog);
47
48 public delegate void DetachFromBackupDelegate(SceneObjectGroup sog);
49
50 public delegate void ChangedBackupDelegate(SceneObjectGroup sog);
51
46 public delegate void ObjectCreateDelegate(EntityBase obj); 52 public delegate void ObjectCreateDelegate(EntityBase obj);
47 53
48 public delegate void ObjectDeleteDelegate(EntityBase obj); 54 public delegate void ObjectDeleteDelegate(EntityBase obj);
@@ -61,6 +67,9 @@ namespace OpenSim.Region.Framework.Scenes
61 private PhysicsCrash handlerPhysicsCrash = null; 67 private PhysicsCrash handlerPhysicsCrash = null;
62 68
63 public event ObjectDuplicateDelegate OnObjectDuplicate; 69 public event ObjectDuplicateDelegate OnObjectDuplicate;
70 public event AttachToBackupDelegate OnAttachToBackup;
71 public event DetachFromBackupDelegate OnDetachFromBackup;
72 public event ChangedBackupDelegate OnChangeBackup;
64 public event ObjectCreateDelegate OnObjectCreate; 73 public event ObjectCreateDelegate OnObjectCreate;
65 public event ObjectDeleteDelegate OnObjectRemove; 74 public event ObjectDeleteDelegate OnObjectRemove;
66 75
@@ -68,7 +77,7 @@ namespace OpenSim.Region.Framework.Scenes
68 77
69 #region Fields 78 #region Fields
70 79
71 protected object m_presenceLock = new object(); 80 protected OpenMetaverse.ReaderWriterLockSlim m_scenePresencesLock = new OpenMetaverse.ReaderWriterLockSlim();
72 protected Dictionary<UUID, ScenePresence> m_scenePresenceMap = new Dictionary<UUID, ScenePresence>(); 81 protected Dictionary<UUID, ScenePresence> m_scenePresenceMap = new Dictionary<UUID, ScenePresence>();
73 protected List<ScenePresence> m_scenePresenceArray = new List<ScenePresence>(); 82 protected List<ScenePresence> m_scenePresenceArray = new List<ScenePresence>();
74 83
@@ -130,13 +139,18 @@ namespace OpenSim.Region.Framework.Scenes
130 139
131 protected internal void Close() 140 protected internal void Close()
132 { 141 {
133 lock (m_presenceLock) 142 m_scenePresencesLock.EnterWriteLock();
143 try
134 { 144 {
135 Dictionary<UUID, ScenePresence> newmap = new Dictionary<UUID, ScenePresence>(); 145 Dictionary<UUID, ScenePresence> newmap = new Dictionary<UUID, ScenePresence>();
136 List<ScenePresence> newlist = new List<ScenePresence>(); 146 List<ScenePresence> newlist = new List<ScenePresence>();
137 m_scenePresenceMap = newmap; 147 m_scenePresenceMap = newmap;
138 m_scenePresenceArray = newlist; 148 m_scenePresenceArray = newlist;
139 } 149 }
150 finally
151 {
152 m_scenePresencesLock.ExitWriteLock();
153 }
140 154
141 lock (SceneObjectGroupsByFullID) 155 lock (SceneObjectGroupsByFullID)
142 SceneObjectGroupsByFullID.Clear(); 156 SceneObjectGroupsByFullID.Clear();
@@ -275,6 +289,33 @@ namespace OpenSim.Region.Framework.Scenes
275 protected internal bool AddRestoredSceneObject( 289 protected internal bool AddRestoredSceneObject(
276 SceneObjectGroup sceneObject, bool attachToBackup, bool alreadyPersisted, bool sendClientUpdates) 290 SceneObjectGroup sceneObject, bool attachToBackup, bool alreadyPersisted, bool sendClientUpdates)
277 { 291 {
292 if (!m_parentScene.CombineRegions)
293 {
294 // KF: Check for out-of-region, move inside and make static.
295 Vector3 npos = new Vector3(sceneObject.RootPart.GroupPosition.X,
296 sceneObject.RootPart.GroupPosition.Y,
297 sceneObject.RootPart.GroupPosition.Z);
298 if (!(((sceneObject.RootPart.Shape.PCode == (byte)PCode.Prim) && (sceneObject.RootPart.Shape.State != 0))) && (npos.X < 0.0 || npos.Y < 0.0 || npos.Z < 0.0 ||
299 npos.X > Constants.RegionSize ||
300 npos.Y > Constants.RegionSize))
301 {
302 if (npos.X < 0.0) npos.X = 1.0f;
303 if (npos.Y < 0.0) npos.Y = 1.0f;
304 if (npos.Z < 0.0) npos.Z = 0.0f;
305 if (npos.X > Constants.RegionSize) npos.X = Constants.RegionSize - 1.0f;
306 if (npos.Y > Constants.RegionSize) npos.Y = Constants.RegionSize - 1.0f;
307
308 foreach (SceneObjectPart part in sceneObject.Parts)
309 {
310 part.GroupPosition = npos;
311 }
312 sceneObject.RootPart.Velocity = Vector3.Zero;
313 sceneObject.RootPart.AngularVelocity = Vector3.Zero;
314 sceneObject.RootPart.Acceleration = Vector3.Zero;
315 sceneObject.RootPart.Velocity = Vector3.Zero;
316 }
317 }
318
278 if (attachToBackup && (!alreadyPersisted)) 319 if (attachToBackup && (!alreadyPersisted))
279 { 320 {
280 sceneObject.ForceInventoryPersistence(); 321 sceneObject.ForceInventoryPersistence();
@@ -492,6 +533,30 @@ namespace OpenSim.Region.Framework.Scenes
492 m_updateList[obj.UUID] = obj; 533 m_updateList[obj.UUID] = obj;
493 } 534 }
494 535
536 public void FireAttachToBackup(SceneObjectGroup obj)
537 {
538 if (OnAttachToBackup != null)
539 {
540 OnAttachToBackup(obj);
541 }
542 }
543
544 public void FireDetachFromBackup(SceneObjectGroup obj)
545 {
546 if (OnDetachFromBackup != null)
547 {
548 OnDetachFromBackup(obj);
549 }
550 }
551
552 public void FireChangeBackup(SceneObjectGroup obj)
553 {
554 if (OnChangeBackup != null)
555 {
556 OnChangeBackup(obj);
557 }
558 }
559
495 /// <summary> 560 /// <summary>
496 /// Process all pending updates 561 /// Process all pending updates
497 /// </summary> 562 /// </summary>
@@ -623,7 +688,8 @@ namespace OpenSim.Region.Framework.Scenes
623 688
624 Entities[presence.UUID] = presence; 689 Entities[presence.UUID] = presence;
625 690
626 lock (m_presenceLock) 691 m_scenePresencesLock.EnterWriteLock();
692 try
627 { 693 {
628 Dictionary<UUID, ScenePresence> newmap = new Dictionary<UUID, ScenePresence>(m_scenePresenceMap); 694 Dictionary<UUID, ScenePresence> newmap = new Dictionary<UUID, ScenePresence>(m_scenePresenceMap);
629 List<ScenePresence> newlist = new List<ScenePresence>(m_scenePresenceArray); 695 List<ScenePresence> newlist = new List<ScenePresence>(m_scenePresenceArray);
@@ -647,6 +713,10 @@ namespace OpenSim.Region.Framework.Scenes
647 m_scenePresenceMap = newmap; 713 m_scenePresenceMap = newmap;
648 m_scenePresenceArray = newlist; 714 m_scenePresenceArray = newlist;
649 } 715 }
716 finally
717 {
718 m_scenePresencesLock.ExitWriteLock();
719 }
650 } 720 }
651 721
652 /// <summary> 722 /// <summary>
@@ -661,7 +731,8 @@ namespace OpenSim.Region.Framework.Scenes
661 agentID); 731 agentID);
662 } 732 }
663 733
664 lock (m_presenceLock) 734 m_scenePresencesLock.EnterWriteLock();
735 try
665 { 736 {
666 Dictionary<UUID, ScenePresence> newmap = new Dictionary<UUID, ScenePresence>(m_scenePresenceMap); 737 Dictionary<UUID, ScenePresence> newmap = new Dictionary<UUID, ScenePresence>(m_scenePresenceMap);
667 List<ScenePresence> newlist = new List<ScenePresence>(m_scenePresenceArray); 738 List<ScenePresence> newlist = new List<ScenePresence>(m_scenePresenceArray);
@@ -683,6 +754,10 @@ namespace OpenSim.Region.Framework.Scenes
683 m_log.WarnFormat("[SCENE GRAPH]: Tried to remove non-existent scene presence with agent ID {0} from scene ScenePresences list", agentID); 754 m_log.WarnFormat("[SCENE GRAPH]: Tried to remove non-existent scene presence with agent ID {0} from scene ScenePresences list", agentID);
684 } 755 }
685 } 756 }
757 finally
758 {
759 m_scenePresencesLock.ExitWriteLock();
760 }
686 } 761 }
687 762
688 protected internal void SwapRootChildAgent(bool direction_RC_CR_T_F) 763 protected internal void SwapRootChildAgent(bool direction_RC_CR_T_F)
@@ -1396,8 +1471,13 @@ namespace OpenSim.Region.Framework.Scenes
1396 { 1471 {
1397 if (group.IsAttachment || (group.RootPart.Shape.PCode == 9 && group.RootPart.Shape.State != 0)) 1472 if (group.IsAttachment || (group.RootPart.Shape.PCode == 9 && group.RootPart.Shape.State != 0))
1398 { 1473 {
1399 if (m_parentScene.AttachmentsModule != null) 1474 // Set the new attachment point data in the object
1400 m_parentScene.AttachmentsModule.UpdateAttachmentPosition(group, pos); 1475 byte attachmentPoint = group.GetAttachmentPoint();
1476 group.UpdateGroupPosition(pos);
1477 group.IsAttachment = false;
1478 group.AbsolutePosition = group.RootPart.AttachedPos;
1479 group.AttachmentPoint = attachmentPoint;
1480 group.HasGroupChanged = true;
1401 } 1481 }
1402 else 1482 else
1403 { 1483 {
@@ -1661,10 +1741,13 @@ namespace OpenSim.Region.Framework.Scenes
1661 /// <param name="childPrims"></param> 1741 /// <param name="childPrims"></param>
1662 protected internal void LinkObjects(SceneObjectPart root, List<SceneObjectPart> children) 1742 protected internal void LinkObjects(SceneObjectPart root, List<SceneObjectPart> children)
1663 { 1743 {
1744 SceneObjectGroup parentGroup = root.ParentGroup;
1745 if (parentGroup == null) return;
1664 Monitor.Enter(m_updateLock); 1746 Monitor.Enter(m_updateLock);
1747
1665 try 1748 try
1666 { 1749 {
1667 SceneObjectGroup parentGroup = root.ParentGroup; 1750 parentGroup.areUpdatesSuspended = true;
1668 1751
1669 List<SceneObjectGroup> childGroups = new List<SceneObjectGroup>(); 1752 List<SceneObjectGroup> childGroups = new List<SceneObjectGroup>();
1670 1753
@@ -1676,9 +1759,13 @@ namespace OpenSim.Region.Framework.Scenes
1676 // Make sure no child prim is set for sale 1759 // Make sure no child prim is set for sale
1677 // So that, on delink, no prims are unwittingly 1760 // So that, on delink, no prims are unwittingly
1678 // left for sale and sold off 1761 // left for sale and sold off
1679 child.RootPart.ObjectSaleType = 0; 1762
1680 child.RootPart.SalePrice = 10; 1763 if (child != null)
1681 childGroups.Add(child); 1764 {
1765 child.RootPart.ObjectSaleType = 0;
1766 child.RootPart.SalePrice = 10;
1767 childGroups.Add(child);
1768 }
1682 } 1769 }
1683 1770
1684 foreach (SceneObjectGroup child in childGroups) 1771 foreach (SceneObjectGroup child in childGroups)
@@ -1694,12 +1781,13 @@ namespace OpenSim.Region.Framework.Scenes
1694 // occur on link to invoke this elsewhere (such as object selection) 1781 // occur on link to invoke this elsewhere (such as object selection)
1695 parentGroup.RootPart.CreateSelected = true; 1782 parentGroup.RootPart.CreateSelected = true;
1696 parentGroup.TriggerScriptChangedEvent(Changed.LINK); 1783 parentGroup.TriggerScriptChangedEvent(Changed.LINK);
1697 parentGroup.HasGroupChanged = true;
1698 parentGroup.ScheduleGroupForFullUpdate();
1699
1700 } 1784 }
1701 finally 1785 finally
1702 { 1786 {
1787 parentGroup.areUpdatesSuspended = false;
1788 parentGroup.HasGroupChanged = true;
1789 parentGroup.ProcessBackup(m_parentScene.SimulationDataService, true);
1790 parentGroup.ScheduleGroupForFullUpdate();
1703 Monitor.Exit(m_updateLock); 1791 Monitor.Exit(m_updateLock);
1704 } 1792 }
1705 } 1793 }
@@ -1731,21 +1819,24 @@ namespace OpenSim.Region.Framework.Scenes
1731 1819
1732 SceneObjectGroup group = part.ParentGroup; 1820 SceneObjectGroup group = part.ParentGroup;
1733 if (!affectedGroups.Contains(group)) 1821 if (!affectedGroups.Contains(group))
1822 {
1823 group.areUpdatesSuspended = true;
1734 affectedGroups.Add(group); 1824 affectedGroups.Add(group);
1825 }
1735 } 1826 }
1736 } 1827 }
1737 } 1828 }
1738 1829
1739 foreach (SceneObjectPart child in childParts) 1830 if (childParts.Count > 0)
1740 { 1831 {
1741 // Unlink all child parts from their groups 1832 foreach (SceneObjectPart child in childParts)
1742 // 1833 {
1743 child.ParentGroup.DelinkFromGroup(child, true); 1834 // Unlink all child parts from their groups
1744 1835 //
1745 // These are not in affected groups and will not be 1836 child.ParentGroup.DelinkFromGroup(child, true);
1746 // handled further. Do the honors here. 1837 child.ParentGroup.HasGroupChanged = true;
1747 child.ParentGroup.HasGroupChanged = true; 1838 child.ParentGroup.ScheduleGroupForFullUpdate();
1748 child.ParentGroup.ScheduleGroupForFullUpdate(); 1839 }
1749 } 1840 }
1750 1841
1751 foreach (SceneObjectPart root in rootParts) 1842 foreach (SceneObjectPart root in rootParts)
@@ -1755,56 +1846,68 @@ namespace OpenSim.Region.Framework.Scenes
1755 // However, editing linked parts and unlinking may be different 1846 // However, editing linked parts and unlinking may be different
1756 // 1847 //
1757 SceneObjectGroup group = root.ParentGroup; 1848 SceneObjectGroup group = root.ParentGroup;
1849 group.areUpdatesSuspended = true;
1758 1850
1759 List<SceneObjectPart> newSet = new List<SceneObjectPart>(group.Parts); 1851 List<SceneObjectPart> newSet = new List<SceneObjectPart>(group.Parts);
1760 int numChildren = newSet.Count; 1852 int numChildren = newSet.Count;
1761 1853
1854 if (numChildren == 1)
1855 break;
1856
1762 // If there are prims left in a link set, but the root is 1857 // If there are prims left in a link set, but the root is
1763 // slated for unlink, we need to do this 1858 // slated for unlink, we need to do this
1859 // Unlink the remaining set
1764 // 1860 //
1765 if (numChildren != 1) 1861 bool sendEventsToRemainder = true;
1766 { 1862 if (numChildren > 1)
1767 // Unlink the remaining set 1863 sendEventsToRemainder = false;
1768 //
1769 bool sendEventsToRemainder = true;
1770 if (numChildren > 1)
1771 sendEventsToRemainder = false;
1772 1864
1773 foreach (SceneObjectPart p in newSet) 1865 foreach (SceneObjectPart p in newSet)
1866 {
1867 if (p != group.RootPart)
1774 { 1868 {
1775 if (p != group.RootPart) 1869 group.DelinkFromGroup(p, sendEventsToRemainder);
1776 group.DelinkFromGroup(p, sendEventsToRemainder); 1870 if (numChildren > 2)
1871 {
1872 p.ParentGroup.areUpdatesSuspended = true;
1873 }
1874 else
1875 {
1876 p.ParentGroup.HasGroupChanged = true;
1877 p.ParentGroup.ScheduleGroupForFullUpdate();
1878 }
1777 } 1879 }
1880 }
1778 1881
1779 // If there is more than one prim remaining, we 1882 // If there is more than one prim remaining, we
1780 // need to re-link 1883 // need to re-link
1884 //
1885 if (numChildren > 2)
1886 {
1887 // Remove old root
1888 //
1889 if (newSet.Contains(root))
1890 newSet.Remove(root);
1891
1892 // Preserve link ordering
1781 // 1893 //
1782 if (numChildren > 2) 1894 newSet.Sort(delegate (SceneObjectPart a, SceneObjectPart b)
1783 { 1895 {
1784 // Remove old root 1896 return a.LinkNum.CompareTo(b.LinkNum);
1785 // 1897 });
1786 if (newSet.Contains(root))
1787 newSet.Remove(root);
1788
1789 // Preserve link ordering
1790 //
1791 newSet.Sort(delegate (SceneObjectPart a, SceneObjectPart b)
1792 {
1793 return a.LinkNum.CompareTo(b.LinkNum);
1794 });
1795 1898
1796 // Determine new root 1899 // Determine new root
1797 // 1900 //
1798 SceneObjectPart newRoot = newSet[0]; 1901 SceneObjectPart newRoot = newSet[0];
1799 newSet.RemoveAt(0); 1902 newSet.RemoveAt(0);
1800 1903
1801 foreach (SceneObjectPart newChild in newSet) 1904 foreach (SceneObjectPart newChild in newSet)
1802 newChild.UpdateFlag = 0; 1905 newChild.UpdateFlag = 0;
1803 1906
1804 LinkObjects(newRoot, newSet); 1907 newRoot.ParentGroup.areUpdatesSuspended = true;
1805 if (!affectedGroups.Contains(newRoot.ParentGroup)) 1908 LinkObjects(newRoot, newSet);
1806 affectedGroups.Add(newRoot.ParentGroup); 1909 if (!affectedGroups.Contains(newRoot.ParentGroup))
1807 } 1910 affectedGroups.Add(newRoot.ParentGroup);
1808 } 1911 }
1809 } 1912 }
1810 1913
@@ -1812,8 +1915,14 @@ namespace OpenSim.Region.Framework.Scenes
1812 // 1915 //
1813 foreach (SceneObjectGroup g in affectedGroups) 1916 foreach (SceneObjectGroup g in affectedGroups)
1814 { 1917 {
1918 // Child prims that have been unlinked and deleted will
1919 // return unless the root is deleted. This will remove them
1920 // from the database. They will be rewritten immediately,
1921 // minus the rows for the unlinked child prims.
1922 m_parentScene.SimulationDataService.RemoveObject(g.UUID, m_parentScene.RegionInfo.RegionID);
1815 g.TriggerScriptChangedEvent(Changed.LINK); 1923 g.TriggerScriptChangedEvent(Changed.LINK);
1816 g.HasGroupChanged = true; // Persist 1924 g.HasGroupChanged = true; // Persist
1925 g.areUpdatesSuspended = false;
1817 g.ScheduleGroupForFullUpdate(); 1926 g.ScheduleGroupForFullUpdate();
1818 } 1927 }
1819 } 1928 }
@@ -1931,9 +2040,6 @@ namespace OpenSim.Region.Framework.Scenes
1931 child.ApplyNextOwnerPermissions(); 2040 child.ApplyNextOwnerPermissions();
1932 } 2041 }
1933 } 2042 }
1934
1935 copy.RootPart.ObjectSaleType = 0;
1936 copy.RootPart.SalePrice = 10;
1937 } 2043 }
1938 2044
1939 // FIXME: This section needs to be refactored so that it just calls AddSceneObject() 2045 // FIXME: This section needs to be refactored so that it just calls AddSceneObject()
diff --git a/OpenSim/Region/Framework/Scenes/SceneObjectGroup.Inventory.cs b/OpenSim/Region/Framework/Scenes/SceneObjectGroup.Inventory.cs
index 905ecc9..6bd9183 100644
--- a/OpenSim/Region/Framework/Scenes/SceneObjectGroup.Inventory.cs
+++ b/OpenSim/Region/Framework/Scenes/SceneObjectGroup.Inventory.cs
@@ -69,10 +69,6 @@ namespace OpenSim.Region.Framework.Scenes
69 /// <summary> 69 /// <summary>
70 /// Stop the scripts contained in all the prims in this group 70 /// Stop the scripts contained in all the prims in this group
71 /// </summary> 71 /// </summary>
72 /// <param name="sceneObjectBeingDeleted">
73 /// Should be true if these scripts are being removed because the scene
74 /// object is being deleted. This will prevent spurious updates to the client.
75 /// </param>
76 public void RemoveScriptInstances(bool sceneObjectBeingDeleted) 72 public void RemoveScriptInstances(bool sceneObjectBeingDeleted)
77 { 73 {
78 SceneObjectPart[] parts = m_parts.GetArray(); 74 SceneObjectPart[] parts = m_parts.GetArray();
@@ -385,6 +381,9 @@ namespace OpenSim.Region.Framework.Scenes
385 381
386 public void ResumeScripts() 382 public void ResumeScripts()
387 { 383 {
384 if (m_scene.RegionInfo.RegionSettings.DisableScripts)
385 return;
386
388 SceneObjectPart[] parts = m_parts.GetArray(); 387 SceneObjectPart[] parts = m_parts.GetArray();
389 for (int i = 0; i < parts.Length; i++) 388 for (int i = 0; i < parts.Length; i++)
390 parts[i].Inventory.ResumeScripts(); 389 parts[i].Inventory.ResumeScripts();
diff --git a/OpenSim/Region/Framework/Scenes/SceneObjectGroup.cs b/OpenSim/Region/Framework/Scenes/SceneObjectGroup.cs
index 2ea9854..8b71f5b 100644
--- a/OpenSim/Region/Framework/Scenes/SceneObjectGroup.cs
+++ b/OpenSim/Region/Framework/Scenes/SceneObjectGroup.cs
@@ -24,11 +24,12 @@
24 * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS 24 * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
25 * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. 25 * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
26 */ 26 */
27 27
28using System; 28using System;
29using System.Collections.Generic; 29using System.Collections.Generic;
30using System.Drawing; 30using System.Drawing;
31using System.IO; 31using System.IO;
32using System.Diagnostics;
32using System.Linq; 33using System.Linq;
33using System.Threading; 34using System.Threading;
34using System.Xml; 35using System.Xml;
@@ -105,8 +106,29 @@ namespace OpenSim.Region.Framework.Scenes
105 /// since the group's last persistent backup 106 /// since the group's last persistent backup
106 /// </summary> 107 /// </summary>
107 private bool m_hasGroupChanged = false; 108 private bool m_hasGroupChanged = false;
108 private long timeFirstChanged; 109 private long timeFirstChanged = 0;
109 private long timeLastChanged; 110 private long timeLastChanged = 0;
111 private long m_maxPersistTime = 0;
112 private long m_minPersistTime = 0;
113 private Random m_rand;
114 private bool m_suspendUpdates;
115 private List<ScenePresence> m_linkedAvatars = new List<ScenePresence>();
116
117 public bool areUpdatesSuspended
118 {
119 get
120 {
121 return m_suspendUpdates;
122 }
123 set
124 {
125 m_suspendUpdates = value;
126 if (!value)
127 {
128 QueueForUpdateCheck();
129 }
130 }
131 }
110 132
111 public bool HasGroupChanged 133 public bool HasGroupChanged
112 { 134 {
@@ -114,9 +136,39 @@ namespace OpenSim.Region.Framework.Scenes
114 { 136 {
115 if (value) 137 if (value)
116 { 138 {
139 if (m_isBackedUp)
140 {
141 m_scene.SceneGraph.FireChangeBackup(this);
142 }
117 timeLastChanged = DateTime.Now.Ticks; 143 timeLastChanged = DateTime.Now.Ticks;
118 if (!m_hasGroupChanged) 144 if (!m_hasGroupChanged)
119 timeFirstChanged = DateTime.Now.Ticks; 145 timeFirstChanged = DateTime.Now.Ticks;
146 if (m_rootPart != null && m_rootPart.UUID != null && m_scene != null)
147 {
148 if (m_rand == null)
149 {
150 byte[] val = new byte[16];
151 m_rootPart.UUID.ToBytes(val, 0);
152 m_rand = new Random(BitConverter.ToInt32(val, 0));
153 }
154
155 if (m_scene.GetRootAgentCount() == 0)
156 {
157 //If the region is empty, this change has been made by an automated process
158 //and thus we delay the persist time by a random amount between 1.5 and 2.5.
159
160 float factor = 1.5f + (float)(m_rand.NextDouble());
161 m_maxPersistTime = (long)((float)m_scene.m_persistAfter * factor);
162 m_minPersistTime = (long)((float)m_scene.m_dontPersistBefore * factor);
163 }
164 else
165 {
166 //If the region is not empty, we want to obey the minimum and maximum persist times
167 //but add a random factor so we stagger the object persistance a little
168 m_maxPersistTime = (long)((float)m_scene.m_persistAfter * (1.0d - (m_rand.NextDouble() / 5.0d))); //Multiply by 1.0-1.5
169 m_minPersistTime = (long)((float)m_scene.m_dontPersistBefore * (1.0d + (m_rand.NextDouble() / 2.0d))); //Multiply by 0.8-1.0
170 }
171 }
120 } 172 }
121 m_hasGroupChanged = value; 173 m_hasGroupChanged = value;
122 174
@@ -131,7 +183,7 @@ namespace OpenSim.Region.Framework.Scenes
131 /// Has the group changed due to an unlink operation? We record this in order to optimize deletion, since 183 /// Has the group changed due to an unlink operation? We record this in order to optimize deletion, since
132 /// an unlinked group currently has to be persisted to the database before we can perform an unlink operation. 184 /// an unlinked group currently has to be persisted to the database before we can perform an unlink operation.
133 /// </summary> 185 /// </summary>
134 public bool HasGroupChangedDueToDelink { get; private set; } 186 public bool HasGroupChangedDueToDelink { get; set; }
135 187
136 private bool isTimeToPersist() 188 private bool isTimeToPersist()
137 { 189 {
@@ -141,8 +193,19 @@ namespace OpenSim.Region.Framework.Scenes
141 return false; 193 return false;
142 if (m_scene.ShuttingDown) 194 if (m_scene.ShuttingDown)
143 return true; 195 return true;
196
197 if (m_minPersistTime == 0 || m_maxPersistTime == 0)
198 {
199 m_maxPersistTime = m_scene.m_persistAfter;
200 m_minPersistTime = m_scene.m_dontPersistBefore;
201 }
202
144 long currentTime = DateTime.Now.Ticks; 203 long currentTime = DateTime.Now.Ticks;
145 if (currentTime - timeLastChanged > m_scene.m_dontPersistBefore || currentTime - timeFirstChanged > m_scene.m_persistAfter) 204
205 if (timeLastChanged == 0) timeLastChanged = currentTime;
206 if (timeFirstChanged == 0) timeFirstChanged = currentTime;
207
208 if (currentTime - timeLastChanged > m_minPersistTime || currentTime - timeFirstChanged > m_maxPersistTime)
146 return true; 209 return true;
147 return false; 210 return false;
148 } 211 }
@@ -247,10 +310,10 @@ namespace OpenSim.Region.Framework.Scenes
247 310
248 private bool m_scriptListens_atTarget; 311 private bool m_scriptListens_atTarget;
249 private bool m_scriptListens_notAtTarget; 312 private bool m_scriptListens_notAtTarget;
250
251 private bool m_scriptListens_atRotTarget; 313 private bool m_scriptListens_atRotTarget;
252 private bool m_scriptListens_notAtRotTarget; 314 private bool m_scriptListens_notAtRotTarget;
253 315
316 public bool m_dupeInProgress = false;
254 internal Dictionary<UUID, string> m_savedScriptState; 317 internal Dictionary<UUID, string> m_savedScriptState;
255 318
256 #region Properties 319 #region Properties
@@ -281,6 +344,16 @@ namespace OpenSim.Region.Framework.Scenes
281 get { return m_parts.Count; } 344 get { return m_parts.Count; }
282 } 345 }
283 346
347// protected Quaternion m_rotation = Quaternion.Identity;
348//
349// public virtual Quaternion Rotation
350// {
351// get { return m_rotation; }
352// set {
353// m_rotation = value;
354// }
355// }
356
284 public Quaternion GroupRotation 357 public Quaternion GroupRotation
285 { 358 {
286 get { return m_rootPart.RotationOffset; } 359 get { return m_rootPart.RotationOffset; }
@@ -389,7 +462,11 @@ namespace OpenSim.Region.Framework.Scenes
389 m_scene.CrossPrimGroupIntoNewRegion(val, this, true); 462 m_scene.CrossPrimGroupIntoNewRegion(val, this, true);
390 } 463 }
391 } 464 }
392 465
466 foreach (SceneObjectPart part in m_parts.GetArray())
467 {
468 part.IgnoreUndoUpdate = true;
469 }
393 if (RootPart.GetStatusSandbox()) 470 if (RootPart.GetStatusSandbox())
394 { 471 {
395 if (Util.GetDistanceTo(RootPart.StatusSandboxPos, value) > 10) 472 if (Util.GetDistanceTo(RootPart.StatusSandboxPos, value) > 10)
@@ -403,10 +480,29 @@ namespace OpenSim.Region.Framework.Scenes
403 return; 480 return;
404 } 481 }
405 } 482 }
406
407 SceneObjectPart[] parts = m_parts.GetArray(); 483 SceneObjectPart[] parts = m_parts.GetArray();
408 for (int i = 0; i < parts.Length; i++) 484 foreach (SceneObjectPart part in parts)
409 parts[i].GroupPosition = val; 485 {
486 part.GroupPosition = val;
487 if (!m_dupeInProgress)
488 {
489 part.TriggerScriptChangedEvent(Changed.POSITION);
490 }
491 }
492 if (!m_dupeInProgress)
493 {
494 foreach (ScenePresence av in m_linkedAvatars)
495 {
496 SceneObjectPart p = m_scene.GetSceneObjectPart(av.ParentID);
497 if (m_parts.TryGetValue(p.UUID, out p))
498 {
499 Vector3 offset = p.GetWorldPosition() - av.ParentPosition;
500 av.AbsolutePosition += offset;
501 av.ParentPosition = p.GetWorldPosition(); //ParentPosition gets cleared by AbsolutePosition
502 av.SendAvatarDataToAllAgents();
503 }
504 }
505 }
410 506
411 //if (m_rootPart.PhysActor != null) 507 //if (m_rootPart.PhysActor != null)
412 //{ 508 //{
@@ -565,6 +661,7 @@ namespace OpenSim.Region.Framework.Scenes
565 /// </summary> 661 /// </summary>
566 public SceneObjectGroup() 662 public SceneObjectGroup()
567 { 663 {
664
568 } 665 }
569 666
570 /// <summary> 667 /// <summary>
@@ -581,7 +678,7 @@ namespace OpenSim.Region.Framework.Scenes
581 /// Constructor. This object is added to the scene later via AttachToScene() 678 /// Constructor. This object is added to the scene later via AttachToScene()
582 /// </summary> 679 /// </summary>
583 public SceneObjectGroup(UUID ownerID, Vector3 pos, Quaternion rot, PrimitiveBaseShape shape) 680 public SceneObjectGroup(UUID ownerID, Vector3 pos, Quaternion rot, PrimitiveBaseShape shape)
584 { 681 {
585 SetRootPart(new SceneObjectPart(ownerID, shape, pos, rot, Vector3.Zero)); 682 SetRootPart(new SceneObjectPart(ownerID, shape, pos, rot, Vector3.Zero));
586 } 683 }
587 684
@@ -629,6 +726,9 @@ namespace OpenSim.Region.Framework.Scenes
629 /// </summary> 726 /// </summary>
630 public virtual void AttachToBackup() 727 public virtual void AttachToBackup()
631 { 728 {
729 if (IsAttachment) return;
730 m_scene.SceneGraph.FireAttachToBackup(this);
731
632 if (InSceneBackup) 732 if (InSceneBackup)
633 { 733 {
634 //m_log.DebugFormat( 734 //m_log.DebugFormat(
@@ -671,6 +771,9 @@ namespace OpenSim.Region.Framework.Scenes
671 771
672 ApplyPhysics(m_scene.m_physicalPrim); 772 ApplyPhysics(m_scene.m_physicalPrim);
673 773
774 if (RootPart.PhysActor != null)
775 RootPart.Buoyancy = RootPart.Buoyancy;
776
674 // Don't trigger the update here - otherwise some client issues occur when multiple updates are scheduled 777 // Don't trigger the update here - otherwise some client issues occur when multiple updates are scheduled
675 // for the same object with very different properties. The caller must schedule the update. 778 // for the same object with very different properties. The caller must schedule the update.
676 //ScheduleGroupForFullUpdate(); 779 //ScheduleGroupForFullUpdate();
@@ -716,9 +819,9 @@ namespace OpenSim.Region.Framework.Scenes
716 result.normal = inter.normal; 819 result.normal = inter.normal;
717 result.distance = inter.distance; 820 result.distance = inter.distance;
718 } 821 }
822
719 } 823 }
720 } 824 }
721
722 return result; 825 return result;
723 } 826 }
724 827
@@ -738,17 +841,19 @@ namespace OpenSim.Region.Framework.Scenes
738 minZ = 8192f; 841 minZ = 8192f;
739 842
740 SceneObjectPart[] parts = m_parts.GetArray(); 843 SceneObjectPart[] parts = m_parts.GetArray();
741 for (int i = 0; i < parts.Length; i++) 844 foreach (SceneObjectPart part in parts)
742 { 845 {
743 SceneObjectPart part = parts[i];
744
745 Vector3 worldPos = part.GetWorldPosition(); 846 Vector3 worldPos = part.GetWorldPosition();
746 Vector3 offset = worldPos - AbsolutePosition; 847 Vector3 offset = worldPos - AbsolutePosition;
747 Quaternion worldRot; 848 Quaternion worldRot;
748 if (part.ParentID == 0) 849 if (part.ParentID == 0)
850 {
749 worldRot = part.RotationOffset; 851 worldRot = part.RotationOffset;
852 }
750 else 853 else
854 {
751 worldRot = part.GetWorldRotation(); 855 worldRot = part.GetWorldRotation();
856 }
752 857
753 Vector3 frontTopLeft; 858 Vector3 frontTopLeft;
754 Vector3 frontTopRight; 859 Vector3 frontTopRight;
@@ -760,6 +865,8 @@ namespace OpenSim.Region.Framework.Scenes
760 Vector3 backBottomLeft; 865 Vector3 backBottomLeft;
761 Vector3 backBottomRight; 866 Vector3 backBottomRight;
762 867
868 // Vector3[] corners = new Vector3[8];
869
763 Vector3 orig = Vector3.Zero; 870 Vector3 orig = Vector3.Zero;
764 871
765 frontTopLeft.X = orig.X - (part.Scale.X / 2); 872 frontTopLeft.X = orig.X - (part.Scale.X / 2);
@@ -794,6 +901,38 @@ namespace OpenSim.Region.Framework.Scenes
794 backBottomRight.Y = orig.Y + (part.Scale.Y / 2); 901 backBottomRight.Y = orig.Y + (part.Scale.Y / 2);
795 backBottomRight.Z = orig.Z - (part.Scale.Z / 2); 902 backBottomRight.Z = orig.Z - (part.Scale.Z / 2);
796 903
904
905
906 //m_log.InfoFormat("pre corner 1 is {0} {1} {2}", frontTopLeft.X, frontTopLeft.Y, frontTopLeft.Z);
907 //m_log.InfoFormat("pre corner 2 is {0} {1} {2}", frontTopRight.X, frontTopRight.Y, frontTopRight.Z);
908 //m_log.InfoFormat("pre corner 3 is {0} {1} {2}", frontBottomRight.X, frontBottomRight.Y, frontBottomRight.Z);
909 //m_log.InfoFormat("pre corner 4 is {0} {1} {2}", frontBottomLeft.X, frontBottomLeft.Y, frontBottomLeft.Z);
910 //m_log.InfoFormat("pre corner 5 is {0} {1} {2}", backTopLeft.X, backTopLeft.Y, backTopLeft.Z);
911 //m_log.InfoFormat("pre corner 6 is {0} {1} {2}", backTopRight.X, backTopRight.Y, backTopRight.Z);
912 //m_log.InfoFormat("pre corner 7 is {0} {1} {2}", backBottomRight.X, backBottomRight.Y, backBottomRight.Z);
913 //m_log.InfoFormat("pre corner 8 is {0} {1} {2}", backBottomLeft.X, backBottomLeft.Y, backBottomLeft.Z);
914
915 //for (int i = 0; i < 8; i++)
916 //{
917 // corners[i] = corners[i] * worldRot;
918 // corners[i] += offset;
919
920 // if (corners[i].X > maxX)
921 // maxX = corners[i].X;
922 // if (corners[i].X < minX)
923 // minX = corners[i].X;
924
925 // if (corners[i].Y > maxY)
926 // maxY = corners[i].Y;
927 // if (corners[i].Y < minY)
928 // minY = corners[i].Y;
929
930 // if (corners[i].Z > maxZ)
931 // maxZ = corners[i].Y;
932 // if (corners[i].Z < minZ)
933 // minZ = corners[i].Z;
934 //}
935
797 frontTopLeft = frontTopLeft * worldRot; 936 frontTopLeft = frontTopLeft * worldRot;
798 frontTopRight = frontTopRight * worldRot; 937 frontTopRight = frontTopRight * worldRot;
799 frontBottomLeft = frontBottomLeft * worldRot; 938 frontBottomLeft = frontBottomLeft * worldRot;
@@ -815,6 +954,15 @@ namespace OpenSim.Region.Framework.Scenes
815 backTopLeft += offset; 954 backTopLeft += offset;
816 backTopRight += offset; 955 backTopRight += offset;
817 956
957 //m_log.InfoFormat("corner 1 is {0} {1} {2}", frontTopLeft.X, frontTopLeft.Y, frontTopLeft.Z);
958 //m_log.InfoFormat("corner 2 is {0} {1} {2}", frontTopRight.X, frontTopRight.Y, frontTopRight.Z);
959 //m_log.InfoFormat("corner 3 is {0} {1} {2}", frontBottomRight.X, frontBottomRight.Y, frontBottomRight.Z);
960 //m_log.InfoFormat("corner 4 is {0} {1} {2}", frontBottomLeft.X, frontBottomLeft.Y, frontBottomLeft.Z);
961 //m_log.InfoFormat("corner 5 is {0} {1} {2}", backTopLeft.X, backTopLeft.Y, backTopLeft.Z);
962 //m_log.InfoFormat("corner 6 is {0} {1} {2}", backTopRight.X, backTopRight.Y, backTopRight.Z);
963 //m_log.InfoFormat("corner 7 is {0} {1} {2}", backBottomRight.X, backBottomRight.Y, backBottomRight.Z);
964 //m_log.InfoFormat("corner 8 is {0} {1} {2}", backBottomLeft.X, backBottomLeft.Y, backBottomLeft.Z);
965
818 if (frontTopRight.X > maxX) 966 if (frontTopRight.X > maxX)
819 maxX = frontTopRight.X; 967 maxX = frontTopRight.X;
820 if (frontTopLeft.X > maxX) 968 if (frontTopLeft.X > maxX)
@@ -960,15 +1108,20 @@ namespace OpenSim.Region.Framework.Scenes
960 1108
961 public void SaveScriptedState(XmlTextWriter writer) 1109 public void SaveScriptedState(XmlTextWriter writer)
962 { 1110 {
1111 SaveScriptedState(writer, false);
1112 }
1113
1114 public void SaveScriptedState(XmlTextWriter writer, bool oldIDs)
1115 {
963 XmlDocument doc = new XmlDocument(); 1116 XmlDocument doc = new XmlDocument();
964 Dictionary<UUID,string> states = new Dictionary<UUID,string>(); 1117 Dictionary<UUID,string> states = new Dictionary<UUID,string>();
965 1118
966 SceneObjectPart[] parts = m_parts.GetArray(); 1119 SceneObjectPart[] parts = m_parts.GetArray();
967 for (int i = 0; i < parts.Length; i++) 1120 for (int i = 0; i < parts.Length; i++)
968 { 1121 {
969 Dictionary<UUID, string> pstates = parts[i].Inventory.GetScriptStates(); 1122 Dictionary<UUID, string> pstates = parts[i].Inventory.GetScriptStates(oldIDs);
970 foreach (KeyValuePair<UUID, string> kvp in pstates) 1123 foreach (KeyValuePair<UUID, string> kvp in pstates)
971 states.Add(kvp.Key, kvp.Value); 1124 states[kvp.Key] = kvp.Value;
972 } 1125 }
973 1126
974 if (states.Count > 0) 1127 if (states.Count > 0)
@@ -988,6 +1141,168 @@ namespace OpenSim.Region.Framework.Scenes
988 } 1141 }
989 1142
990 /// <summary> 1143 /// <summary>
1144 /// Add the avatar to this linkset (avatar is sat).
1145 /// </summary>
1146 /// <param name="agentID"></param>
1147 public void AddAvatar(UUID agentID)
1148 {
1149 ScenePresence presence;
1150 if (m_scene.TryGetScenePresence(agentID, out presence))
1151 {
1152 if (!m_linkedAvatars.Contains(presence))
1153 {
1154 m_linkedAvatars.Add(presence);
1155 }
1156 }
1157 }
1158
1159 /// <summary>
1160 /// Delete the avatar from this linkset (avatar is unsat).
1161 /// </summary>
1162 /// <param name="agentID"></param>
1163 public void DeleteAvatar(UUID agentID)
1164 {
1165 ScenePresence presence;
1166 if (m_scene.TryGetScenePresence(agentID, out presence))
1167 {
1168 if (m_linkedAvatars.Contains(presence))
1169 {
1170 m_linkedAvatars.Remove(presence);
1171 }
1172 }
1173 }
1174
1175 /// <summary>
1176 /// Returns the list of linked presences (avatars sat on this group)
1177 /// </summary>
1178 /// <param name="agentID"></param>
1179 public List<ScenePresence> GetLinkedAvatars()
1180 {
1181 return m_linkedAvatars;
1182 }
1183
1184 /// <summary>
1185 /// Attach this scene object to the given avatar.
1186 /// </summary>
1187 /// <param name="agentID"></param>
1188 /// <param name="attachmentpoint"></param>
1189 /// <param name="AttachOffset"></param>
1190 private void AttachToAgent(
1191 ScenePresence avatar, SceneObjectGroup so, uint attachmentpoint, Vector3 attachOffset, bool silent)
1192 {
1193 if (avatar != null)
1194 {
1195 // don't attach attachments to child agents
1196 if (avatar.IsChildAgent) return;
1197
1198 // Remove from database and parcel prim count
1199 m_scene.DeleteFromStorage(so.UUID);
1200 m_scene.EventManager.TriggerParcelPrimCountTainted();
1201
1202 so.AttachedAvatar = avatar.UUID;
1203
1204 if (so.RootPart.PhysActor != null)
1205 {
1206 m_scene.PhysicsScene.RemovePrim(so.RootPart.PhysActor);
1207 so.RootPart.PhysActor = null;
1208 }
1209
1210 so.AbsolutePosition = attachOffset;
1211 so.RootPart.AttachedPos = attachOffset;
1212 so.IsAttachment = true;
1213 so.RootPart.SetParentLocalId(avatar.LocalId);
1214 so.AttachmentPoint = attachmentpoint;
1215
1216 avatar.AddAttachment(this);
1217
1218 if (!silent)
1219 {
1220 // Killing it here will cause the client to deselect it
1221 // It then reappears on the avatar, deselected
1222 // through the full update below
1223 //
1224 if (IsSelected)
1225 {
1226 m_scene.SendKillObject(new List<uint> { m_rootPart.LocalId });
1227 }
1228
1229 IsSelected = false; // fudge....
1230 ScheduleGroupForFullUpdate();
1231 }
1232 }
1233 else
1234 {
1235 m_log.WarnFormat(
1236 "[SOG]: Tried to add attachment {0} to avatar with UUID {1} in region {2} but the avatar is not present",
1237 UUID, avatar.ControllingClient.AgentId, Scene.RegionInfo.RegionName);
1238 }
1239 }
1240
1241 public byte GetAttachmentPoint()
1242 {
1243 return m_rootPart.Shape.State;
1244 }
1245
1246 public void DetachToGround()
1247 {
1248 ScenePresence avatar = m_scene.GetScenePresence(AttachedAvatar);
1249 if (avatar == null)
1250 return;
1251
1252 avatar.RemoveAttachment(this);
1253
1254 Vector3 detachedpos = new Vector3(127f,127f,127f);
1255 if (avatar == null)
1256 return;
1257
1258 detachedpos = avatar.AbsolutePosition;
1259 RootPart.FromItemID = UUID.Zero;
1260
1261 AbsolutePosition = detachedpos;
1262 AttachedAvatar = UUID.Zero;
1263
1264 //SceneObjectPart[] parts = m_parts.GetArray();
1265 //for (int i = 0; i < parts.Length; i++)
1266 // parts[i].AttachedAvatar = UUID.Zero;
1267
1268 m_rootPart.SetParentLocalId(0);
1269 AttachmentPoint = (byte)0;
1270 m_rootPart.ApplyPhysics(m_rootPart.GetEffectiveObjectFlags(), m_rootPart.VolumeDetectActive);
1271 HasGroupChanged = true;
1272 RootPart.Rezzed = DateTime.Now;
1273 RootPart.RemFlag(PrimFlags.TemporaryOnRez);
1274 AttachToBackup();
1275 m_scene.EventManager.TriggerParcelPrimCountTainted();
1276 m_rootPart.ScheduleFullUpdate();
1277 m_rootPart.ClearUndoState();
1278 }
1279
1280 public void DetachToInventoryPrep()
1281 {
1282 ScenePresence avatar = m_scene.GetScenePresence(AttachedAvatar);
1283 //Vector3 detachedpos = new Vector3(127f, 127f, 127f);
1284 if (avatar != null)
1285 {
1286 //detachedpos = avatar.AbsolutePosition;
1287 avatar.RemoveAttachment(this);
1288 }
1289
1290 AttachedAvatar = UUID.Zero;
1291
1292 /*SceneObjectPart[] parts = m_parts.GetArray();
1293 for (int i = 0; i < parts.Length; i++)
1294 parts[i].AttachedAvatar = UUID.Zero;*/
1295
1296 m_rootPart.SetParentLocalId(0);
1297 //m_rootPart.SetAttachmentPoint((byte)0);
1298 IsAttachment = false;
1299 AbsolutePosition = m_rootPart.AttachedPos;
1300 //m_rootPart.ApplyPhysics(m_rootPart.GetEffectiveObjectFlags(), m_scene.m_physicalPrim);
1301 //AttachToBackup();
1302 //m_rootPart.ScheduleFullUpdate();
1303 }
1304
1305 /// <summary>
991 /// 1306 ///
992 /// </summary> 1307 /// </summary>
993 /// <param name="part"></param> 1308 /// <param name="part"></param>
@@ -1037,7 +1352,10 @@ namespace OpenSim.Region.Framework.Scenes
1037 public void AddPart(SceneObjectPart part) 1352 public void AddPart(SceneObjectPart part)
1038 { 1353 {
1039 part.SetParent(this); 1354 part.SetParent(this);
1040 part.LinkNum = m_parts.Add(part.UUID, part); 1355 m_parts.Add(part.UUID, part);
1356
1357 part.LinkNum = m_parts.Count;
1358
1041 if (part.LinkNum == 2) 1359 if (part.LinkNum == 2)
1042 RootPart.LinkNum = 1; 1360 RootPart.LinkNum = 1;
1043 } 1361 }
@@ -1145,6 +1463,11 @@ namespace OpenSim.Region.Framework.Scenes
1145 /// <param name="silent">If true then deletion is not broadcast to clients</param> 1463 /// <param name="silent">If true then deletion is not broadcast to clients</param>
1146 public void DeleteGroupFromScene(bool silent) 1464 public void DeleteGroupFromScene(bool silent)
1147 { 1465 {
1466 // We need to keep track of this state in case this group is still queued for backup.
1467 IsDeleted = true;
1468
1469 DetachFromBackup();
1470
1148 SceneObjectPart[] parts = m_parts.GetArray(); 1471 SceneObjectPart[] parts = m_parts.GetArray();
1149 for (int i = 0; i < parts.Length; i++) 1472 for (int i = 0; i < parts.Length; i++)
1150 { 1473 {
@@ -1156,17 +1479,19 @@ namespace OpenSim.Region.Framework.Scenes
1156 avatar.StandUp(); 1479 avatar.StandUp();
1157 1480
1158 if (!silent) 1481 if (!silent)
1159 { 1482 {
1160 part.UpdateFlag = 0; 1483 part.UpdateFlag = 0;
1161 if (part == m_rootPart) 1484 if (part == m_rootPart)
1162 { 1485 {
1163 if (!IsAttachment || (AttachedAvatar == avatar.ControllingClient.AgentId) || 1486 if (!IsAttachment || (AttachedAvatar == avatar.ControllingClient.AgentId) ||
1164 (AttachmentPoint < 31) || (AttachmentPoint > 38)) 1487 (AttachmentPoint < 31) || (AttachmentPoint > 38))
1165 avatar.ControllingClient.SendKillObject(m_regionHandle, part.LocalId); 1488 avatar.ControllingClient.SendKillObject(m_regionHandle, new List<uint>() {part.LocalId});
1166 } 1489 }
1167 } 1490 }
1168 }); 1491 });
1169 } 1492 }
1493
1494
1170 } 1495 }
1171 1496
1172 public void AddScriptLPS(int count) 1497 public void AddScriptLPS(int count)
@@ -1263,7 +1588,12 @@ namespace OpenSim.Region.Framework.Scenes
1263 1588
1264 public void SetOwnerId(UUID userId) 1589 public void SetOwnerId(UUID userId)
1265 { 1590 {
1266 ForEachPart(delegate(SceneObjectPart part) { part.OwnerID = userId; }); 1591 ForEachPart(delegate(SceneObjectPart part)
1592 {
1593
1594 part.OwnerID = userId;
1595
1596 });
1267 } 1597 }
1268 1598
1269 public void ForEachPart(Action<SceneObjectPart> whatToDo) 1599 public void ForEachPart(Action<SceneObjectPart> whatToDo)
@@ -1295,11 +1625,17 @@ namespace OpenSim.Region.Framework.Scenes
1295 return; 1625 return;
1296 } 1626 }
1297 1627
1628 if ((RootPart.Flags & PrimFlags.TemporaryOnRez) != 0)
1629 return;
1630
1298 // Since this is the top of the section of call stack for backing up a particular scene object, don't let 1631 // Since this is the top of the section of call stack for backing up a particular scene object, don't let
1299 // any exception propogate upwards. 1632 // any exception propogate upwards.
1300 try 1633 try
1301 { 1634 {
1302 if (!m_scene.ShuttingDown) // if shutting down then there will be nothing to handle the return so leave till next restart 1635 if (!m_scene.ShuttingDown || // if shutting down then there will be nothing to handle the return so leave till next restart
1636 m_scene.LoginsDisabled || // We're starting up or doing maintenance, don't mess with things
1637 m_scene.LoadingPrims) // Land may not be valid yet
1638
1303 { 1639 {
1304 ILandObject parcel = m_scene.LandChannel.GetLandObject( 1640 ILandObject parcel = m_scene.LandChannel.GetLandObject(
1305 m_rootPart.GroupPosition.X, m_rootPart.GroupPosition.Y); 1641 m_rootPart.GroupPosition.X, m_rootPart.GroupPosition.Y);
@@ -1326,6 +1662,7 @@ namespace OpenSim.Region.Framework.Scenes
1326 } 1662 }
1327 } 1663 }
1328 } 1664 }
1665
1329 } 1666 }
1330 1667
1331 if (m_scene.UseBackup && HasGroupChanged) 1668 if (m_scene.UseBackup && HasGroupChanged)
@@ -1333,6 +1670,20 @@ namespace OpenSim.Region.Framework.Scenes
1333 // don't backup while it's selected or you're asking for changes mid stream. 1670 // don't backup while it's selected or you're asking for changes mid stream.
1334 if (isTimeToPersist() || forcedBackup) 1671 if (isTimeToPersist() || forcedBackup)
1335 { 1672 {
1673 if (m_rootPart.PhysActor != null &&
1674 (!m_rootPart.PhysActor.IsPhysical))
1675 {
1676 // Possible ghost prim
1677 if (m_rootPart.PhysActor.Position != m_rootPart.GroupPosition)
1678 {
1679 foreach (SceneObjectPart part in m_parts.GetArray())
1680 {
1681 // Re-set physics actor positions and
1682 // orientations
1683 part.GroupPosition = m_rootPart.GroupPosition;
1684 }
1685 }
1686 }
1336// m_log.DebugFormat( 1687// m_log.DebugFormat(
1337// "[SCENE]: Storing {0}, {1} in {2}", 1688// "[SCENE]: Storing {0}, {1} in {2}",
1338// Name, UUID, m_scene.RegionInfo.RegionName); 1689// Name, UUID, m_scene.RegionInfo.RegionName);
@@ -1410,7 +1761,7 @@ namespace OpenSim.Region.Framework.Scenes
1410 // This is only necessary when userExposed is false! 1761 // This is only necessary when userExposed is false!
1411 1762
1412 bool previousAttachmentStatus = dupe.IsAttachment; 1763 bool previousAttachmentStatus = dupe.IsAttachment;
1413 1764
1414 if (!userExposed) 1765 if (!userExposed)
1415 dupe.IsAttachment = true; 1766 dupe.IsAttachment = true;
1416 1767
@@ -1428,11 +1779,11 @@ namespace OpenSim.Region.Framework.Scenes
1428 dupe.m_rootPart.TrimPermissions(); 1779 dupe.m_rootPart.TrimPermissions();
1429 1780
1430 List<SceneObjectPart> partList = new List<SceneObjectPart>(m_parts.GetArray()); 1781 List<SceneObjectPart> partList = new List<SceneObjectPart>(m_parts.GetArray());
1431 1782
1432 partList.Sort(delegate(SceneObjectPart p1, SceneObjectPart p2) 1783 partList.Sort(delegate(SceneObjectPart p1, SceneObjectPart p2)
1433 { 1784 {
1434 return p1.LinkNum.CompareTo(p2.LinkNum); 1785 return p1.LinkNum.CompareTo(p2.LinkNum);
1435 } 1786 }
1436 ); 1787 );
1437 1788
1438 foreach (SceneObjectPart part in partList) 1789 foreach (SceneObjectPart part in partList)
@@ -1452,7 +1803,7 @@ namespace OpenSim.Region.Framework.Scenes
1452 if (part.PhysActor != null && userExposed) 1803 if (part.PhysActor != null && userExposed)
1453 { 1804 {
1454 PrimitiveBaseShape pbs = newPart.Shape; 1805 PrimitiveBaseShape pbs = newPart.Shape;
1455 1806
1456 newPart.PhysActor 1807 newPart.PhysActor
1457 = m_scene.PhysicsScene.AddPrimShape( 1808 = m_scene.PhysicsScene.AddPrimShape(
1458 string.Format("{0}/{1}", newPart.Name, newPart.UUID), 1809 string.Format("{0}/{1}", newPart.Name, newPart.UUID),
@@ -1462,11 +1813,11 @@ namespace OpenSim.Region.Framework.Scenes
1462 newPart.RotationOffset, 1813 newPart.RotationOffset,
1463 part.PhysActor.IsPhysical, 1814 part.PhysActor.IsPhysical,
1464 newPart.LocalId); 1815 newPart.LocalId);
1465 1816
1466 newPart.DoPhysicsPropertyUpdate(part.PhysActor.IsPhysical, true); 1817 newPart.DoPhysicsPropertyUpdate(part.PhysActor.IsPhysical, true);
1467 } 1818 }
1468 } 1819 }
1469 1820
1470 if (userExposed) 1821 if (userExposed)
1471 { 1822 {
1472 dupe.UpdateParentIDs(); 1823 dupe.UpdateParentIDs();
@@ -1581,6 +1932,7 @@ namespace OpenSim.Region.Framework.Scenes
1581 return Vector3.Zero; 1932 return Vector3.Zero;
1582 } 1933 }
1583 1934
1935 // This is used by both Double-Click Auto-Pilot and llMoveToTarget() in an attached object
1584 public void moveToTarget(Vector3 target, float tau) 1936 public void moveToTarget(Vector3 target, float tau)
1585 { 1937 {
1586 if (IsAttachment) 1938 if (IsAttachment)
@@ -1608,10 +1960,44 @@ namespace OpenSim.Region.Framework.Scenes
1608 RootPart.PhysActor.PIDActive = false; 1960 RootPart.PhysActor.PIDActive = false;
1609 } 1961 }
1610 1962
1963 public void rotLookAt(Quaternion target, float strength, float damping)
1964 {
1965 SceneObjectPart rootpart = m_rootPart;
1966 if (rootpart != null)
1967 {
1968 if (IsAttachment)
1969 {
1970 /*
1971 ScenePresence avatar = m_scene.GetScenePresence(rootpart.AttachedAvatar);
1972 if (avatar != null)
1973 {
1974 Rotate the Av?
1975 } */
1976 }
1977 else
1978 {
1979 if (rootpart.PhysActor != null)
1980 { // APID must be implemented in your physics system for this to function.
1981 rootpart.PhysActor.APIDTarget = new Quaternion(target.X, target.Y, target.Z, target.W);
1982 rootpart.PhysActor.APIDStrength = strength;
1983 rootpart.PhysActor.APIDDamping = damping;
1984 rootpart.PhysActor.APIDActive = true;
1985 }
1986 }
1987 }
1988 }
1989
1611 public void stopLookAt() 1990 public void stopLookAt()
1612 { 1991 {
1613 if (RootPart.PhysActor != null) 1992 SceneObjectPart rootpart = m_rootPart;
1614 RootPart.PhysActor.APIDActive = false; 1993 if (rootpart != null)
1994 {
1995 if (rootpart.PhysActor != null)
1996 { // APID must be implemented in your physics system for this to function.
1997 rootpart.PhysActor.APIDActive = false;
1998 }
1999 }
2000
1615 } 2001 }
1616 2002
1617 /// <summary> 2003 /// <summary>
@@ -1669,6 +2055,8 @@ namespace OpenSim.Region.Framework.Scenes
1669 public SceneObjectPart CopyPart(SceneObjectPart part, UUID cAgentID, UUID cGroupID, bool userExposed) 2055 public SceneObjectPart CopyPart(SceneObjectPart part, UUID cAgentID, UUID cGroupID, bool userExposed)
1670 { 2056 {
1671 SceneObjectPart newPart = part.Copy(m_scene.AllocateLocalId(), OwnerID, GroupID, m_parts.Count, userExposed); 2057 SceneObjectPart newPart = part.Copy(m_scene.AllocateLocalId(), OwnerID, GroupID, m_parts.Count, userExposed);
2058 newPart.SetParent(this);
2059
1672 AddPart(newPart); 2060 AddPart(newPart);
1673 2061
1674 SetPartAsNonRoot(newPart); 2062 SetPartAsNonRoot(newPart);
@@ -1815,11 +2203,11 @@ namespace OpenSim.Region.Framework.Scenes
1815 /// Immediately send a full update for this scene object. 2203 /// Immediately send a full update for this scene object.
1816 /// </summary> 2204 /// </summary>
1817 public void SendGroupFullUpdate() 2205 public void SendGroupFullUpdate()
1818 { 2206 {
1819 if (IsDeleted) 2207 if (IsDeleted)
1820 return; 2208 return;
1821 2209
1822// m_log.DebugFormat("[SOG]: Sending immediate full group update for {0} {1}", Name, UUID); 2210// m_log.DebugFormat("[SOG]: Sending immediate full group update for {0} {1}", Name, UUID);
1823 2211
1824 RootPart.SendFullUpdateToAllClients(); 2212 RootPart.SendFullUpdateToAllClients();
1825 2213
@@ -1983,6 +2371,7 @@ namespace OpenSim.Region.Framework.Scenes
1983 Quaternion oldRootRotation = linkPart.RotationOffset; 2371 Quaternion oldRootRotation = linkPart.RotationOffset;
1984 2372
1985 linkPart.OffsetPosition = linkPart.GroupPosition - AbsolutePosition; 2373 linkPart.OffsetPosition = linkPart.GroupPosition - AbsolutePosition;
2374 linkPart.ParentID = m_rootPart.LocalId;
1986 linkPart.GroupPosition = AbsolutePosition; 2375 linkPart.GroupPosition = AbsolutePosition;
1987 Vector3 axPos = linkPart.OffsetPosition; 2376 Vector3 axPos = linkPart.OffsetPosition;
1988 2377
@@ -2015,12 +2404,15 @@ namespace OpenSim.Region.Framework.Scenes
2015 part.LinkNum += objectGroup.PrimCount; 2404 part.LinkNum += objectGroup.PrimCount;
2016 } 2405 }
2017 } 2406 }
2407 }
2018 2408
2019 linkPart.LinkNum = 2; 2409 linkPart.LinkNum = 2;
2020 2410
2021 linkPart.SetParent(this); 2411 linkPart.SetParent(this);
2022 linkPart.CreateSelected = true; 2412 linkPart.CreateSelected = true;
2023 2413
2414 lock (m_parts.SyncRoot)
2415 {
2024 //if (linkPart.PhysActor != null) 2416 //if (linkPart.PhysActor != null)
2025 //{ 2417 //{
2026 // m_scene.PhysicsScene.RemovePrim(linkPart.PhysActor); 2418 // m_scene.PhysicsScene.RemovePrim(linkPart.PhysActor);
@@ -2178,6 +2570,7 @@ namespace OpenSim.Region.Framework.Scenes
2178 /// <param name="objectGroup"></param> 2570 /// <param name="objectGroup"></param>
2179 public virtual void DetachFromBackup() 2571 public virtual void DetachFromBackup()
2180 { 2572 {
2573 m_scene.SceneGraph.FireDetachFromBackup(this);
2181 if (m_isBackedUp && Scene != null) 2574 if (m_isBackedUp && Scene != null)
2182 m_scene.EventManager.OnBackup -= ProcessBackup; 2575 m_scene.EventManager.OnBackup -= ProcessBackup;
2183 2576
@@ -2196,7 +2589,8 @@ namespace OpenSim.Region.Framework.Scenes
2196 2589
2197 axPos *= parentRot; 2590 axPos *= parentRot;
2198 part.OffsetPosition = axPos; 2591 part.OffsetPosition = axPos;
2199 part.GroupPosition = oldGroupPosition + part.OffsetPosition; 2592 Vector3 newPos = oldGroupPosition + part.OffsetPosition;
2593 part.GroupPosition = newPos;
2200 part.OffsetPosition = Vector3.Zero; 2594 part.OffsetPosition = Vector3.Zero;
2201 part.RotationOffset = worldRot; 2595 part.RotationOffset = worldRot;
2202 2596
@@ -2207,7 +2601,7 @@ namespace OpenSim.Region.Framework.Scenes
2207 2601
2208 part.LinkNum = linkNum; 2602 part.LinkNum = linkNum;
2209 2603
2210 part.OffsetPosition = part.GroupPosition - AbsolutePosition; 2604 part.OffsetPosition = newPos - AbsolutePosition;
2211 2605
2212 Quaternion rootRotation = m_rootPart.RotationOffset; 2606 Quaternion rootRotation = m_rootPart.RotationOffset;
2213 2607
@@ -2217,7 +2611,7 @@ namespace OpenSim.Region.Framework.Scenes
2217 2611
2218 parentRot = m_rootPart.RotationOffset; 2612 parentRot = m_rootPart.RotationOffset;
2219 oldRot = part.RotationOffset; 2613 oldRot = part.RotationOffset;
2220 Quaternion newRot = Quaternion.Inverse(parentRot) * oldRot; 2614 Quaternion newRot = Quaternion.Inverse(parentRot) * worldRot;
2221 part.RotationOffset = newRot; 2615 part.RotationOffset = newRot;
2222 } 2616 }
2223 2617
@@ -2464,8 +2858,12 @@ namespace OpenSim.Region.Framework.Scenes
2464 } 2858 }
2465 } 2859 }
2466 2860
2861 RootPart.UpdatePrimFlags(UsePhysics, IsTemporary, IsPhantom, SetVolumeDetect);
2467 for (int i = 0; i < parts.Length; i++) 2862 for (int i = 0; i < parts.Length; i++)
2468 parts[i].UpdatePrimFlags(UsePhysics, SetTemporary, SetPhantom, SetVolumeDetect); 2863 {
2864 if (parts[i] != RootPart)
2865 parts[i].UpdatePrimFlags(UsePhysics, IsTemporary, IsPhantom, SetVolumeDetect);
2866 }
2469 } 2867 }
2470 } 2868 }
2471 2869
@@ -2478,6 +2876,17 @@ namespace OpenSim.Region.Framework.Scenes
2478 } 2876 }
2479 } 2877 }
2480 2878
2879
2880
2881 /// <summary>
2882 /// Gets the number of parts
2883 /// </summary>
2884 /// <returns></returns>
2885 public int GetPartCount()
2886 {
2887 return Parts.Count();
2888 }
2889
2481 /// <summary> 2890 /// <summary>
2482 /// Update the texture entry for this part 2891 /// Update the texture entry for this part
2483 /// </summary> 2892 /// </summary>
@@ -2534,7 +2943,6 @@ namespace OpenSim.Region.Framework.Scenes
2534 { 2943 {
2535// m_log.DebugFormat( 2944// m_log.DebugFormat(
2536// "[SCENE OBJECT GROUP]: Group resizing {0} {1} from {2} to {3}", Name, LocalId, RootPart.Scale, scale); 2945// "[SCENE OBJECT GROUP]: Group resizing {0} {1} from {2} to {3}", Name, LocalId, RootPart.Scale, scale);
2537
2538 RootPart.StoreUndoState(true); 2946 RootPart.StoreUndoState(true);
2539 2947
2540 scale.X = Math.Min(scale.X, Scene.m_maxNonphys); 2948 scale.X = Math.Min(scale.X, Scene.m_maxNonphys);
@@ -2635,7 +3043,6 @@ namespace OpenSim.Region.Framework.Scenes
2635 prevScale.X *= x; 3043 prevScale.X *= x;
2636 prevScale.Y *= y; 3044 prevScale.Y *= y;
2637 prevScale.Z *= z; 3045 prevScale.Z *= z;
2638
2639// RootPart.IgnoreUndoUpdate = true; 3046// RootPart.IgnoreUndoUpdate = true;
2640 RootPart.Resize(prevScale); 3047 RootPart.Resize(prevScale);
2641// RootPart.IgnoreUndoUpdate = false; 3048// RootPart.IgnoreUndoUpdate = false;
@@ -2666,7 +3073,9 @@ namespace OpenSim.Region.Framework.Scenes
2666 } 3073 }
2667 3074
2668// obPart.IgnoreUndoUpdate = false; 3075// obPart.IgnoreUndoUpdate = false;
2669// obPart.StoreUndoState(); 3076 HasGroupChanged = true;
3077 m_rootPart.TriggerScriptChangedEvent(Changed.SCALE);
3078 ScheduleGroupForTerseUpdate();
2670 } 3079 }
2671 3080
2672// m_log.DebugFormat( 3081// m_log.DebugFormat(
@@ -2726,9 +3135,9 @@ namespace OpenSim.Region.Framework.Scenes
2726 { 3135 {
2727 SceneObjectPart part = GetChildPart(localID); 3136 SceneObjectPart part = GetChildPart(localID);
2728 3137
2729// SceneObjectPart[] parts = m_parts.GetArray(); 3138 SceneObjectPart[] parts = m_parts.GetArray();
2730// for (int i = 0; i < parts.Length; i++) 3139 for (int i = 0; i < parts.Length; i++)
2731// parts[i].StoreUndoState(); 3140 parts[i].StoreUndoState();
2732 3141
2733 if (part != null) 3142 if (part != null)
2734 { 3143 {
@@ -2784,10 +3193,27 @@ namespace OpenSim.Region.Framework.Scenes
2784 obPart.OffsetPosition = obPart.OffsetPosition + diff; 3193 obPart.OffsetPosition = obPart.OffsetPosition + diff;
2785 } 3194 }
2786 3195
2787 AbsolutePosition = newPos; 3196 //We have to set undoing here because otherwise an undo state will be saved
3197 if (!m_rootPart.Undoing)
3198 {
3199 m_rootPart.Undoing = true;
3200 AbsolutePosition = newPos;
3201 m_rootPart.Undoing = false;
3202 }
3203 else
3204 {
3205 AbsolutePosition = newPos;
3206 }
2788 3207
2789 HasGroupChanged = true; 3208 HasGroupChanged = true;
2790 ScheduleGroupForTerseUpdate(); 3209 if (m_rootPart.Undoing)
3210 {
3211 ScheduleGroupForFullUpdate();
3212 }
3213 else
3214 {
3215 ScheduleGroupForTerseUpdate();
3216 }
2791 } 3217 }
2792 3218
2793 #endregion 3219 #endregion
@@ -2864,10 +3290,7 @@ namespace OpenSim.Region.Framework.Scenes
2864 public void UpdateSingleRotation(Quaternion rot, uint localID) 3290 public void UpdateSingleRotation(Quaternion rot, uint localID)
2865 { 3291 {
2866 SceneObjectPart part = GetChildPart(localID); 3292 SceneObjectPart part = GetChildPart(localID);
2867
2868 SceneObjectPart[] parts = m_parts.GetArray(); 3293 SceneObjectPart[] parts = m_parts.GetArray();
2869 for (int i = 0; i < parts.Length; i++)
2870 parts[i].StoreUndoState();
2871 3294
2872 if (part != null) 3295 if (part != null)
2873 { 3296 {
@@ -2905,7 +3328,16 @@ namespace OpenSim.Region.Framework.Scenes
2905 if (part.UUID == m_rootPart.UUID) 3328 if (part.UUID == m_rootPart.UUID)
2906 { 3329 {
2907 UpdateRootRotation(rot); 3330 UpdateRootRotation(rot);
2908 AbsolutePosition = pos; 3331 if (!m_rootPart.Undoing)
3332 {
3333 m_rootPart.Undoing = true;
3334 AbsolutePosition = pos;
3335 m_rootPart.Undoing = false;
3336 }
3337 else
3338 {
3339 AbsolutePosition = pos;
3340 }
2909 } 3341 }
2910 else 3342 else
2911 { 3343 {
@@ -2929,9 +3361,10 @@ namespace OpenSim.Region.Framework.Scenes
2929 3361
2930 Quaternion axRot = rot; 3362 Quaternion axRot = rot;
2931 Quaternion oldParentRot = m_rootPart.RotationOffset; 3363 Quaternion oldParentRot = m_rootPart.RotationOffset;
2932
2933 m_rootPart.StoreUndoState(); 3364 m_rootPart.StoreUndoState();
2934 m_rootPart.UpdateRotation(rot); 3365
3366 //Don't use UpdateRotation because it schedules an update prematurely
3367 m_rootPart.RotationOffset = rot;
2935 if (m_rootPart.PhysActor != null) 3368 if (m_rootPart.PhysActor != null)
2936 { 3369 {
2937 m_rootPart.PhysActor.Orientation = m_rootPart.RotationOffset; 3370 m_rootPart.PhysActor.Orientation = m_rootPart.RotationOffset;
@@ -2945,15 +3378,18 @@ namespace OpenSim.Region.Framework.Scenes
2945 if (prim.UUID != m_rootPart.UUID) 3378 if (prim.UUID != m_rootPart.UUID)
2946 { 3379 {
2947 prim.IgnoreUndoUpdate = true; 3380 prim.IgnoreUndoUpdate = true;
3381
3382 Quaternion NewRot = oldParentRot * prim.RotationOffset;
3383 NewRot = Quaternion.Inverse(axRot) * NewRot;
3384 prim.RotationOffset = NewRot;
3385
2948 Vector3 axPos = prim.OffsetPosition; 3386 Vector3 axPos = prim.OffsetPosition;
3387
2949 axPos *= oldParentRot; 3388 axPos *= oldParentRot;
2950 axPos *= Quaternion.Inverse(axRot); 3389 axPos *= Quaternion.Inverse(axRot);
2951 prim.OffsetPosition = axPos; 3390 prim.OffsetPosition = axPos;
2952 Quaternion primsRot = prim.RotationOffset; 3391
2953 Quaternion newRot = primsRot * oldParentRot; 3392 prim.IgnoreUndoUpdate = false;
2954 newRot *= Quaternion.Inverse(axRot);
2955 prim.RotationOffset = newRot;
2956 prim.ScheduleTerseUpdate();
2957 prim.IgnoreUndoUpdate = false; 3393 prim.IgnoreUndoUpdate = false;
2958 } 3394 }
2959 } 3395 }
@@ -2967,8 +3403,8 @@ namespace OpenSim.Region.Framework.Scenes
2967//// childpart.StoreUndoState(); 3403//// childpart.StoreUndoState();
2968// } 3404// }
2969// } 3405// }
2970 3406 HasGroupChanged = true;
2971 m_rootPart.ScheduleTerseUpdate(); 3407 ScheduleGroupForFullUpdate();
2972 3408
2973// m_log.DebugFormat( 3409// m_log.DebugFormat(
2974// "[SCENE OBJECT GROUP]: Updated root rotation of {0} {1} to {2}", 3410// "[SCENE OBJECT GROUP]: Updated root rotation of {0} {1} to {2}",
@@ -3196,7 +3632,6 @@ namespace OpenSim.Region.Framework.Scenes
3196 public float GetMass() 3632 public float GetMass()
3197 { 3633 {
3198 float retmass = 0f; 3634 float retmass = 0f;
3199
3200 SceneObjectPart[] parts = m_parts.GetArray(); 3635 SceneObjectPart[] parts = m_parts.GetArray();
3201 for (int i = 0; i < parts.Length; i++) 3636 for (int i = 0; i < parts.Length; i++)
3202 retmass += parts[i].GetMass(); 3637 retmass += parts[i].GetMass();
@@ -3290,6 +3725,14 @@ namespace OpenSim.Region.Framework.Scenes
3290 SetFromItemID(uuid); 3725 SetFromItemID(uuid);
3291 } 3726 }
3292 3727
3728 public void ResetOwnerChangeFlag()
3729 {
3730 ForEachPart(delegate(SceneObjectPart part)
3731 {
3732 part.ResetOwnerChangeFlag();
3733 });
3734 }
3735
3293 #endregion 3736 #endregion
3294 } 3737 }
3295} 3738}
diff --git a/OpenSim/Region/Framework/Scenes/SceneObjectPart.cs b/OpenSim/Region/Framework/Scenes/SceneObjectPart.cs
index b68cc9f..a2e13ce 100644
--- a/OpenSim/Region/Framework/Scenes/SceneObjectPart.cs
+++ b/OpenSim/Region/Framework/Scenes/SceneObjectPart.cs
@@ -62,7 +62,8 @@ namespace OpenSim.Region.Framework.Scenes
62 TELEPORT = 512, 62 TELEPORT = 512,
63 REGION_RESTART = 1024, 63 REGION_RESTART = 1024,
64 MEDIA = 2048, 64 MEDIA = 2048,
65 ANIMATION = 16384 65 ANIMATION = 16384,
66 POSITION = 32768
66 } 67 }
67 68
68 // I don't really know where to put this except here. 69 // I don't really know where to put this except here.
@@ -177,6 +178,15 @@ namespace OpenSim.Region.Framework.Scenes
177 178
178 public UUID FromFolderID; 179 public UUID FromFolderID;
179 180
181 // The following two are to hold the attachment data
182 // while an object is inworld
183 [XmlIgnore]
184 public byte AttachPoint = 0;
185
186 [XmlIgnore]
187 public Vector3 AttachOffset = Vector3.Zero;
188
189 [XmlIgnore]
180 public int STATUS_ROTATE_X; 190 public int STATUS_ROTATE_X;
181 191
182 public int STATUS_ROTATE_Y; 192 public int STATUS_ROTATE_Y;
@@ -246,6 +256,7 @@ namespace OpenSim.Region.Framework.Scenes
246 private Quaternion m_sitTargetOrientation = Quaternion.Identity; 256 private Quaternion m_sitTargetOrientation = Quaternion.Identity;
247 private Vector3 m_sitTargetPosition; 257 private Vector3 m_sitTargetPosition;
248 private string m_sitAnimation = "SIT"; 258 private string m_sitAnimation = "SIT";
259 private bool m_occupied; // KF if any av is sitting on this prim
249 private string m_text = String.Empty; 260 private string m_text = String.Empty;
250 private string m_touchName = String.Empty; 261 private string m_touchName = String.Empty;
251 private readonly Stack<UndoState> m_undo = new Stack<UndoState>(5); 262 private readonly Stack<UndoState> m_undo = new Stack<UndoState>(5);
@@ -289,6 +300,7 @@ namespace OpenSim.Region.Framework.Scenes
289 protected Vector3 m_lastAcceleration; 300 protected Vector3 m_lastAcceleration;
290 protected Vector3 m_lastAngularVelocity; 301 protected Vector3 m_lastAngularVelocity;
291 protected int m_lastTerseSent; 302 protected int m_lastTerseSent;
303 protected float m_buoyancy = 0.0f;
292 304
293 /// <summary> 305 /// <summary>
294 /// Stores media texture data 306 /// Stores media texture data
@@ -341,7 +353,7 @@ namespace OpenSim.Region.Framework.Scenes
341 UUID ownerID, PrimitiveBaseShape shape, Vector3 groupPosition, 353 UUID ownerID, PrimitiveBaseShape shape, Vector3 groupPosition,
342 Quaternion rotationOffset, Vector3 offsetPosition) 354 Quaternion rotationOffset, Vector3 offsetPosition)
343 { 355 {
344 m_name = "Primitive"; 356 m_name = "Object";
345 357
346 Rezzed = DateTime.UtcNow; 358 Rezzed = DateTime.UtcNow;
347 _creationDate = (int)Utils.DateTimeToUnixTime(Rezzed); 359 _creationDate = (int)Utils.DateTimeToUnixTime(Rezzed);
@@ -396,7 +408,7 @@ namespace OpenSim.Region.Framework.Scenes
396 private uint _ownerMask = (uint)PermissionMask.All; 408 private uint _ownerMask = (uint)PermissionMask.All;
397 private uint _groupMask = (uint)PermissionMask.None; 409 private uint _groupMask = (uint)PermissionMask.None;
398 private uint _everyoneMask = (uint)PermissionMask.None; 410 private uint _everyoneMask = (uint)PermissionMask.None;
399 private uint _nextOwnerMask = (uint)PermissionMask.All; 411 private uint _nextOwnerMask = (uint)(PermissionMask.Move | PermissionMask.Modify | PermissionMask.Transfer);
400 private PrimFlags _flags = PrimFlags.None; 412 private PrimFlags _flags = PrimFlags.None;
401 private DateTime m_expires; 413 private DateTime m_expires;
402 private DateTime m_rezzed; 414 private DateTime m_rezzed;
@@ -495,12 +507,16 @@ namespace OpenSim.Region.Framework.Scenes
495 } 507 }
496 508
497 /// <value> 509 /// <value>
498 /// Access should be via Inventory directly - this property temporarily remains for xml serialization purposes 510 /// Get the inventory list
499 /// </value> 511 /// </value>
500 public TaskInventoryDictionary TaskInventory 512 public TaskInventoryDictionary TaskInventory
501 { 513 {
502 get { return m_inventory.Items; } 514 get {
503 set { m_inventory.Items = value; } 515 return m_inventory.Items;
516 }
517 set {
518 m_inventory.Items = value;
519 }
504 } 520 }
505 521
506 /// <summary> 522 /// <summary>
@@ -641,14 +657,12 @@ namespace OpenSim.Region.Framework.Scenes
641 set { m_LoopSoundSlavePrims = value; } 657 set { m_LoopSoundSlavePrims = value; }
642 } 658 }
643 659
644
645 public Byte[] TextureAnimation 660 public Byte[] TextureAnimation
646 { 661 {
647 get { return m_TextureAnimation; } 662 get { return m_TextureAnimation; }
648 set { m_TextureAnimation = value; } 663 set { m_TextureAnimation = value; }
649 } 664 }
650 665
651
652 public Byte[] ParticleSystem 666 public Byte[] ParticleSystem
653 { 667 {
654 get { return m_particleSystem; } 668 get { return m_particleSystem; }
@@ -685,9 +699,11 @@ namespace OpenSim.Region.Framework.Scenes
685 { 699 {
686 // If this is a linkset, we don't want the physics engine mucking up our group position here. 700 // If this is a linkset, we don't want the physics engine mucking up our group position here.
687 PhysicsActor actor = PhysActor; 701 PhysicsActor actor = PhysActor;
688 if (actor != null && _parentID == 0) 702 if (_parentID == 0)
689 { 703 {
690 m_groupPosition = actor.Position; 704 if (actor != null)
705 m_groupPosition = actor.Position;
706 return m_groupPosition;
691 } 707 }
692 708
693 if (m_parentGroup.IsAttachment) 709 if (m_parentGroup.IsAttachment)
@@ -697,12 +713,14 @@ namespace OpenSim.Region.Framework.Scenes
697 return sp.AbsolutePosition; 713 return sp.AbsolutePosition;
698 } 714 }
699 715
716 // use root prim's group position. Physics may have updated it
717 if (ParentGroup.RootPart != this)
718 m_groupPosition = ParentGroup.RootPart.GroupPosition;
700 return m_groupPosition; 719 return m_groupPosition;
701 } 720 }
702 set 721 set
703 { 722 {
704 m_groupPosition = value; 723 m_groupPosition = value;
705
706 PhysicsActor actor = PhysActor; 724 PhysicsActor actor = PhysActor;
707 if (actor != null) 725 if (actor != null)
708 { 726 {
@@ -722,22 +740,13 @@ namespace OpenSim.Region.Framework.Scenes
722 740
723 // Tell the physics engines that this prim changed. 741 // Tell the physics engines that this prim changed.
724 m_parentGroup.Scene.PhysicsScene.AddPhysicsActorTaint(actor); 742 m_parentGroup.Scene.PhysicsScene.AddPhysicsActorTaint(actor);
743
725 } 744 }
726 catch (Exception e) 745 catch (Exception e)
727 { 746 {
728 m_log.Error("[SCENEOBJECTPART]: GROUP POSITION. " + e.Message); 747 m_log.Error("[SCENEOBJECTPART]: GROUP POSITION. " + e.Message);
729 } 748 }
730 } 749 }
731
732 // TODO if we decide to do sitting in a more SL compatible way (multiple avatars per prim), this has to be fixed, too
733 if (m_sitTargetAvatar != UUID.Zero)
734 {
735 ScenePresence avatar;
736 if (m_parentGroup.Scene.TryGetScenePresence(m_sitTargetAvatar, out avatar))
737 {
738 avatar.ParentPosition = GetWorldPosition();
739 }
740 }
741 } 750 }
742 } 751 }
743 752
@@ -746,7 +755,7 @@ namespace OpenSim.Region.Framework.Scenes
746 get { return m_offsetPosition; } 755 get { return m_offsetPosition; }
747 set 756 set
748 { 757 {
749// StoreUndoState(); 758 Vector3 oldpos = m_offsetPosition;
750 m_offsetPosition = value; 759 m_offsetPosition = value;
751 760
752 if (ParentGroup != null && !ParentGroup.IsDeleted) 761 if (ParentGroup != null && !ParentGroup.IsDeleted)
@@ -761,7 +770,22 @@ namespace OpenSim.Region.Framework.Scenes
761 if (m_parentGroup.Scene != null) 770 if (m_parentGroup.Scene != null)
762 m_parentGroup.Scene.PhysicsScene.AddPhysicsActorTaint(actor); 771 m_parentGroup.Scene.PhysicsScene.AddPhysicsActorTaint(actor);
763 } 772 }
773
774 if (!m_parentGroup.m_dupeInProgress)
775 {
776 List<ScenePresence> avs = ParentGroup.GetLinkedAvatars();
777 foreach (ScenePresence av in avs)
778 {
779 if (av.ParentID == m_localId)
780 {
781 Vector3 offset = (m_offsetPosition - oldpos);
782 av.AbsolutePosition += offset;
783 av.SendAvatarDataToAllAgents();
784 }
785 }
786 }
764 } 787 }
788 TriggerScriptChangedEvent(Changed.POSITION);
765 } 789 }
766 } 790 }
767 791
@@ -902,7 +926,16 @@ namespace OpenSim.Region.Framework.Scenes
902 /// <summary></summary> 926 /// <summary></summary>
903 public Vector3 Acceleration 927 public Vector3 Acceleration
904 { 928 {
905 get { return m_acceleration; } 929 get
930 {
931 PhysicsActor actor = PhysActor;
932 if (actor != null)
933 {
934 m_acceleration = actor.Acceleration;
935 }
936 return m_acceleration;
937 }
938
906 set { m_acceleration = value; } 939 set { m_acceleration = value; }
907 } 940 }
908 941
@@ -1233,6 +1266,13 @@ namespace OpenSim.Region.Framework.Scenes
1233 _flags = value; 1266 _flags = value;
1234 } 1267 }
1235 } 1268 }
1269
1270 [XmlIgnore]
1271 public bool IsOccupied // KF If an av is sittingon this prim
1272 {
1273 get { return m_occupied; }
1274 set { m_occupied = value; }
1275 }
1236 1276
1237 /// <summary> 1277 /// <summary>
1238 /// ID of the avatar that is sat on us. If there is no such avatar then is UUID.Zero 1278 /// ID of the avatar that is sat on us. If there is no such avatar then is UUID.Zero
@@ -1292,6 +1332,19 @@ namespace OpenSim.Region.Framework.Scenes
1292 set { m_collisionSoundVolume = value; } 1332 set { m_collisionSoundVolume = value; }
1293 } 1333 }
1294 1334
1335 public float Buoyancy
1336 {
1337 get { return m_buoyancy; }
1338 set
1339 {
1340 m_buoyancy = value;
1341 if (PhysActor != null)
1342 {
1343 PhysActor.Buoyancy = value;
1344 }
1345 }
1346 }
1347
1295 #endregion Public Properties with only Get 1348 #endregion Public Properties with only Get
1296 1349
1297 private uint ApplyMask(uint val, bool set, uint mask) 1350 private uint ApplyMask(uint val, bool set, uint mask)
@@ -1663,6 +1716,9 @@ namespace OpenSim.Region.Framework.Scenes
1663 1716
1664 // Move afterwards ResetIDs as it clears the localID 1717 // Move afterwards ResetIDs as it clears the localID
1665 dupe.LocalId = localID; 1718 dupe.LocalId = localID;
1719 if(dupe.PhysActor != null)
1720 dupe.PhysActor.LocalID = localID;
1721
1666 // This may be wrong... it might have to be applied in SceneObjectGroup to the object that's being duplicated. 1722 // This may be wrong... it might have to be applied in SceneObjectGroup to the object that's being duplicated.
1667 dupe._lastOwnerID = OwnerID; 1723 dupe._lastOwnerID = OwnerID;
1668 1724
@@ -2024,19 +2080,17 @@ namespace OpenSim.Region.Framework.Scenes
2024 public Vector3 GetWorldPosition() 2080 public Vector3 GetWorldPosition()
2025 { 2081 {
2026 Quaternion parentRot = ParentGroup.RootPart.RotationOffset; 2082 Quaternion parentRot = ParentGroup.RootPart.RotationOffset;
2027
2028 Vector3 axPos = OffsetPosition; 2083 Vector3 axPos = OffsetPosition;
2029
2030 axPos *= parentRot; 2084 axPos *= parentRot;
2031 Vector3 translationOffsetPosition = axPos; 2085 Vector3 translationOffsetPosition = axPos;
2032 2086 if(_parentID == 0)
2033// m_log.DebugFormat("[SCENE OBJECT PART]: Found group pos {0} for part {1}", GroupPosition, Name); 2087 {
2034 2088 return GroupPosition;
2035 Vector3 worldPos = GroupPosition + translationOffsetPosition; 2089 }
2036 2090 else
2037// m_log.DebugFormat("[SCENE OBJECT PART]: Found world pos {0} for part {1}", worldPos, Name); 2091 {
2038 2092 return ParentGroup.AbsolutePosition + translationOffsetPosition; //KF: Fix child prim position
2039 return worldPos; 2093 }
2040 } 2094 }
2041 2095
2042 /// <summary> 2096 /// <summary>
@@ -2676,17 +2730,18 @@ namespace OpenSim.Region.Framework.Scenes
2676 //Trys to fetch sound id from prim's inventory. 2730 //Trys to fetch sound id from prim's inventory.
2677 //Prim's inventory doesn't support non script items yet 2731 //Prim's inventory doesn't support non script items yet
2678 2732
2679 lock (TaskInventory) 2733 TaskInventory.LockItemsForRead(true);
2734
2735 foreach (KeyValuePair<UUID, TaskInventoryItem> item in TaskInventory)
2680 { 2736 {
2681 foreach (KeyValuePair<UUID, TaskInventoryItem> item in TaskInventory) 2737 if (item.Value.Name == sound)
2682 { 2738 {
2683 if (item.Value.Name == sound) 2739 soundID = item.Value.ItemID;
2684 { 2740 break;
2685 soundID = item.Value.ItemID;
2686 break;
2687 }
2688 } 2741 }
2689 } 2742 }
2743
2744 TaskInventory.LockItemsForRead(false);
2690 } 2745 }
2691 2746
2692 m_parentGroup.Scene.ForEachRootScenePresence(delegate(ScenePresence sp) 2747 m_parentGroup.Scene.ForEachRootScenePresence(delegate(ScenePresence sp)
@@ -2769,7 +2824,7 @@ namespace OpenSim.Region.Framework.Scenes
2769 2824
2770 public void RotLookAt(Quaternion target, float strength, float damping) 2825 public void RotLookAt(Quaternion target, float strength, float damping)
2771 { 2826 {
2772 rotLookAt(target, strength, damping); 2827 m_parentGroup.rotLookAt(target, strength, damping); // This calls method in SceneObjectGroup.
2773 } 2828 }
2774 2829
2775 public void rotLookAt(Quaternion target, float strength, float damping) 2830 public void rotLookAt(Quaternion target, float strength, float damping)
@@ -3015,8 +3070,8 @@ namespace OpenSim.Region.Framework.Scenes
3015 { 3070 {
3016 const float ROTATION_TOLERANCE = 0.01f; 3071 const float ROTATION_TOLERANCE = 0.01f;
3017 const float VELOCITY_TOLERANCE = 0.001f; 3072 const float VELOCITY_TOLERANCE = 0.001f;
3018 const float POSITION_TOLERANCE = 0.05f; 3073 const float POSITION_TOLERANCE = 0.05f; // I don't like this, but I suppose it's necessary
3019 const int TIME_MS_TOLERANCE = 3000; 3074 const int TIME_MS_TOLERANCE = 200; //llSetPos has a 200ms delay. This should NOT be 3 seconds.
3020 3075
3021 if (m_updateFlag == 1) 3076 if (m_updateFlag == 1)
3022 { 3077 {
@@ -3030,7 +3085,7 @@ namespace OpenSim.Region.Framework.Scenes
3030 Environment.TickCount - m_lastTerseSent > TIME_MS_TOLERANCE) 3085 Environment.TickCount - m_lastTerseSent > TIME_MS_TOLERANCE)
3031 { 3086 {
3032 AddTerseUpdateToAllAvatars(); 3087 AddTerseUpdateToAllAvatars();
3033 ClearUpdateSchedule(); 3088
3034 3089
3035 // This causes the Scene to 'poll' physical objects every couple of frames 3090 // This causes the Scene to 'poll' physical objects every couple of frames
3036 // bad, so it's been replaced by an event driven method. 3091 // bad, so it's been replaced by an event driven method.
@@ -3048,16 +3103,18 @@ namespace OpenSim.Region.Framework.Scenes
3048 m_lastAngularVelocity = AngularVelocity; 3103 m_lastAngularVelocity = AngularVelocity;
3049 m_lastTerseSent = Environment.TickCount; 3104 m_lastTerseSent = Environment.TickCount;
3050 } 3105 }
3106 //Moved this outside of the if clause so updates don't get blocked.. *sigh*
3107 m_updateFlag = 0; //Why were we calling a function to do this? Inefficient! *screams*
3051 } 3108 }
3052 else 3109 else
3053 { 3110 {
3054 if (m_updateFlag == 2) // is a new prim, just created/reloaded or has major changes 3111 if (m_updateFlag == 2) // is a new prim, just created/reloaded or has major changes
3055 { 3112 {
3056 AddFullUpdateToAllAvatars(); 3113 AddFullUpdateToAllAvatars();
3057 ClearUpdateSchedule(); 3114 m_updateFlag = 0; //Same here
3058 } 3115 }
3059 } 3116 }
3060 ClearUpdateSchedule(); 3117 m_updateFlag = 0;
3061 } 3118 }
3062 3119
3063 /// <summary> 3120 /// <summary>
@@ -3085,17 +3142,16 @@ namespace OpenSim.Region.Framework.Scenes
3085 if (!UUID.TryParse(sound, out soundID)) 3142 if (!UUID.TryParse(sound, out soundID))
3086 { 3143 {
3087 // search sound file from inventory 3144 // search sound file from inventory
3088 lock (TaskInventory) 3145 TaskInventory.LockItemsForRead(true);
3146 foreach (KeyValuePair<UUID, TaskInventoryItem> item in TaskInventory)
3089 { 3147 {
3090 foreach (KeyValuePair<UUID, TaskInventoryItem> item in TaskInventory) 3148 if (item.Value.Name == sound && item.Value.Type == (int)AssetType.Sound)
3091 { 3149 {
3092 if (item.Value.Name == sound && item.Value.Type == (int)AssetType.Sound) 3150 soundID = item.Value.ItemID;
3093 { 3151 break;
3094 soundID = item.Value.ItemID;
3095 break;
3096 }
3097 } 3152 }
3098 } 3153 }
3154 TaskInventory.LockItemsForRead(false);
3099 } 3155 }
3100 3156
3101 if (soundID == UUID.Zero) 3157 if (soundID == UUID.Zero)
@@ -3506,7 +3562,7 @@ namespace OpenSim.Region.Framework.Scenes
3506 3562
3507 public void StopLookAt() 3563 public void StopLookAt()
3508 { 3564 {
3509 m_parentGroup.stopLookAt(); 3565 m_parentGroup.stopLookAt(); // This calls method in SceneObjectGroup.
3510 3566
3511 m_parentGroup.ScheduleGroupForTerseUpdate(); 3567 m_parentGroup.ScheduleGroupForTerseUpdate();
3512 } 3568 }
@@ -3557,45 +3613,45 @@ namespace OpenSim.Region.Framework.Scenes
3557 // TODO: May need to fix for group comparison 3613 // TODO: May need to fix for group comparison
3558 if (last.Compare(this)) 3614 if (last.Compare(this))
3559 { 3615 {
3560 // m_log.DebugFormat( 3616 // m_log.DebugFormat(
3561 // "[SCENE OBJECT PART]: Not storing undo for {0} {1} since current state is same as last undo state, initial stack size {2}", 3617 // "[SCENE OBJECT PART]: Not storing undo for {0} {1} since current state is same as last undo state, initial stack size {2}",
3562 // Name, LocalId, m_undo.Count); 3618 // Name, LocalId, m_undo.Count);
3563 3619
3564 return; 3620 return;
3565 } 3621 }
3566 } 3622 }
3567 } 3623 }
3568 3624
3569 // m_log.DebugFormat( 3625 // m_log.DebugFormat(
3570 // "[SCENE OBJECT PART]: Storing undo state for {0} {1}, forGroup {2}, initial stack size {3}", 3626 // "[SCENE OBJECT PART]: Storing undo state for {0} {1}, forGroup {2}, initial stack size {3}",
3571 // Name, LocalId, forGroup, m_undo.Count); 3627 // Name, LocalId, forGroup, m_undo.Count);
3572 3628
3573 if (m_parentGroup.GetSceneMaxUndo() > 0) 3629 if (m_parentGroup.GetSceneMaxUndo() > 0)
3574 { 3630 {
3575 UndoState nUndo = new UndoState(this, forGroup); 3631 UndoState nUndo = new UndoState(this, forGroup);
3576 3632
3577 m_undo.Push(nUndo); 3633 m_undo.Push(nUndo);
3578 3634
3579 if (m_redo.Count > 0) 3635 if (m_redo.Count > 0)
3580 m_redo.Clear(); 3636 m_redo.Clear();
3581 3637
3582 // m_log.DebugFormat( 3638 // m_log.DebugFormat(
3583 // "[SCENE OBJECT PART]: Stored undo state for {0} {1}, forGroup {2}, stack size now {3}", 3639 // "[SCENE OBJECT PART]: Stored undo state for {0} {1}, forGroup {2}, stack size now {3}",
3584 // Name, LocalId, forGroup, m_undo.Count); 3640 // Name, LocalId, forGroup, m_undo.Count);
3585 } 3641 }
3586 } 3642 }
3587 } 3643 }
3588 } 3644 }
3589// else 3645 // else
3590// { 3646 // {
3591// m_log.DebugFormat("[SCENE OBJECT PART]: Ignoring undo store for {0} {1}", Name, LocalId); 3647 // m_log.DebugFormat("[SCENE OBJECT PART]: Ignoring undo store for {0} {1}", Name, LocalId);
3592// } 3648 // }
3593 } 3649 }
3594// else 3650 // else
3595// { 3651 // {
3596// m_log.DebugFormat( 3652 // m_log.DebugFormat(
3597// "[SCENE OBJECT PART]: Ignoring undo store for {0} {1} since already undoing", Name, LocalId); 3653 // "[SCENE OBJECT PART]: Ignoring undo store for {0} {1} since already undoing", Name, LocalId);
3598// } 3654 // }
3599 } 3655 }
3600 3656
3601 /// <summary> 3657 /// <summary>
@@ -4643,8 +4699,9 @@ namespace OpenSim.Region.Framework.Scenes
4643 { 4699 {
4644 m_shape.TextureEntry = textureEntry; 4700 m_shape.TextureEntry = textureEntry;
4645 TriggerScriptChangedEvent(Changed.TEXTURE); 4701 TriggerScriptChangedEvent(Changed.TEXTURE);
4646 4702 m_updateFlag = 1;
4647 ParentGroup.HasGroupChanged = true; 4703 ParentGroup.HasGroupChanged = true;
4704
4648 //This is madness.. 4705 //This is madness..
4649 //ParentGroup.ScheduleGroupForFullUpdate(); 4706 //ParentGroup.ScheduleGroupForFullUpdate();
4650 //This is sparta 4707 //This is sparta
@@ -4841,5 +4898,17 @@ namespace OpenSim.Region.Framework.Scenes
4841 Color color = Color; 4898 Color color = Color;
4842 return new Color4(color.R, color.G, color.B, (byte)(0xFF - color.A)); 4899 return new Color4(color.R, color.G, color.B, (byte)(0xFF - color.A));
4843 } 4900 }
4901
4902 public void ResetOwnerChangeFlag()
4903 {
4904 List<UUID> inv = Inventory.GetInventoryList();
4905
4906 foreach (UUID itemID in inv)
4907 {
4908 TaskInventoryItem item = Inventory.GetInventoryItem(itemID);
4909 item.OwnerChanged = false;
4910 Inventory.UpdateInventoryItem(item, false, false);
4911 }
4912 }
4844 } 4913 }
4845} 4914}
diff --git a/OpenSim/Region/Framework/Scenes/SceneObjectPartInventory.cs b/OpenSim/Region/Framework/Scenes/SceneObjectPartInventory.cs
index 9446741..07e303f 100644
--- a/OpenSim/Region/Framework/Scenes/SceneObjectPartInventory.cs
+++ b/OpenSim/Region/Framework/Scenes/SceneObjectPartInventory.cs
@@ -48,6 +48,9 @@ namespace OpenSim.Region.Framework.Scenes
48 private string m_inventoryFileName = String.Empty; 48 private string m_inventoryFileName = String.Empty;
49 private byte[] m_inventoryFileData = new byte[0]; 49 private byte[] m_inventoryFileData = new byte[0];
50 private uint m_inventoryFileNameSerial = 0; 50 private uint m_inventoryFileNameSerial = 0;
51 private bool m_inventoryPrivileged = false;
52
53 private Dictionary<UUID, ArrayList> m_scriptErrors = new Dictionary<UUID, ArrayList>();
51 54
52 /// <value> 55 /// <value>
53 /// The part to which the inventory belongs. 56 /// The part to which the inventory belongs.
@@ -84,11 +87,14 @@ namespace OpenSim.Region.Framework.Scenes
84 /// </value> 87 /// </value>
85 protected internal TaskInventoryDictionary Items 88 protected internal TaskInventoryDictionary Items
86 { 89 {
87 get { return m_items; } 90 get {
91 return m_items;
92 }
88 set 93 set
89 { 94 {
90 m_items = value; 95 m_items = value;
91 m_inventorySerial++; 96 m_inventorySerial++;
97 QueryScriptStates();
92 } 98 }
93 } 99 }
94 100
@@ -123,38 +129,45 @@ namespace OpenSim.Region.Framework.Scenes
123 public void ResetInventoryIDs() 129 public void ResetInventoryIDs()
124 { 130 {
125 if (null == m_part) 131 if (null == m_part)
126 return; 132 m_items.LockItemsForWrite(true);
127 133
128 lock (m_items) 134 if (Items.Count == 0)
129 { 135 {
130 if (0 == m_items.Count) 136 m_items.LockItemsForWrite(false);
131 return; 137 return;
138 }
132 139
133 IList<TaskInventoryItem> items = GetInventoryItems(); 140 IList<TaskInventoryItem> items = new List<TaskInventoryItem>(Items.Values);
134 m_items.Clear(); 141 Items.Clear();
135 142
136 foreach (TaskInventoryItem item in items) 143 foreach (TaskInventoryItem item in items)
137 { 144 {
138 item.ResetIDs(m_part.UUID); 145 item.ResetIDs(m_part.UUID);
139 m_items.Add(item.ItemID, item); 146 Items.Add(item.ItemID, item);
140 }
141 } 147 }
148 m_items.LockItemsForWrite(false);
142 } 149 }
143 150
144 public void ResetObjectID() 151 public void ResetObjectID()
145 { 152 {
146 lock (Items) 153 m_items.LockItemsForWrite(true);
154
155 if (Items.Count == 0)
147 { 156 {
148 IList<TaskInventoryItem> items = new List<TaskInventoryItem>(Items.Values); 157 m_items.LockItemsForWrite(false);
149 Items.Clear(); 158 return;
150
151 foreach (TaskInventoryItem item in items)
152 {
153 item.ParentPartID = m_part.UUID;
154 item.ParentID = m_part.UUID;
155 Items.Add(item.ItemID, item);
156 }
157 } 159 }
160
161 IList<TaskInventoryItem> items = new List<TaskInventoryItem>(Items.Values);
162 Items.Clear();
163
164 foreach (TaskInventoryItem item in items)
165 {
166 item.ParentPartID = m_part.UUID;
167 item.ParentID = m_part.UUID;
168 Items.Add(item.ItemID, item);
169 }
170 m_items.LockItemsForWrite(false);
158 } 171 }
159 172
160 /// <summary> 173 /// <summary>
@@ -163,12 +176,11 @@ namespace OpenSim.Region.Framework.Scenes
163 /// <param name="ownerId"></param> 176 /// <param name="ownerId"></param>
164 public void ChangeInventoryOwner(UUID ownerId) 177 public void ChangeInventoryOwner(UUID ownerId)
165 { 178 {
166 lock (Items) 179 m_items.LockItemsForWrite(true);
180 if (0 == Items.Count)
167 { 181 {
168 if (0 == Items.Count) 182 m_items.LockItemsForWrite(false);
169 { 183 return;
170 return;
171 }
172 } 184 }
173 185
174 HasInventoryChanged = true; 186 HasInventoryChanged = true;
@@ -184,6 +196,7 @@ namespace OpenSim.Region.Framework.Scenes
184 item.PermsGranter = UUID.Zero; 196 item.PermsGranter = UUID.Zero;
185 item.OwnerChanged = true; 197 item.OwnerChanged = true;
186 } 198 }
199 m_items.LockItemsForWrite(false);
187 } 200 }
188 201
189 /// <summary> 202 /// <summary>
@@ -192,12 +205,11 @@ namespace OpenSim.Region.Framework.Scenes
192 /// <param name="groupID"></param> 205 /// <param name="groupID"></param>
193 public void ChangeInventoryGroup(UUID groupID) 206 public void ChangeInventoryGroup(UUID groupID)
194 { 207 {
195 lock (Items) 208 m_items.LockItemsForWrite(true);
209 if (0 == Items.Count)
196 { 210 {
197 if (0 == Items.Count) 211 m_items.LockItemsForWrite(false);
198 { 212 return;
199 return;
200 }
201 } 213 }
202 214
203 // Don't let this set the HasGroupChanged flag for attachments 215 // Don't let this set the HasGroupChanged flag for attachments
@@ -209,12 +221,45 @@ namespace OpenSim.Region.Framework.Scenes
209 m_part.ParentGroup.HasGroupChanged = true; 221 m_part.ParentGroup.HasGroupChanged = true;
210 } 222 }
211 223
212 List<TaskInventoryItem> items = GetInventoryItems(); 224 IList<TaskInventoryItem> items = new List<TaskInventoryItem>(Items.Values);
213 foreach (TaskInventoryItem item in items) 225 foreach (TaskInventoryItem item in items)
214 { 226 {
215 if (groupID != item.GroupID) 227 if (groupID != item.GroupID)
228 {
216 item.GroupID = groupID; 229 item.GroupID = groupID;
230 }
217 } 231 }
232 m_items.LockItemsForWrite(false);
233 }
234
235 private void QueryScriptStates()
236 {
237 if (m_part == null || m_part.ParentGroup == null)
238 return;
239
240 IScriptModule[] engines = m_part.ParentGroup.Scene.RequestModuleInterfaces<IScriptModule>();
241 if (engines == null) // No engine at all
242 return;
243
244 Items.LockItemsForRead(true);
245 foreach (TaskInventoryItem item in Items.Values)
246 {
247 if (item.InvType == (int)InventoryType.LSL)
248 {
249 foreach (IScriptModule e in engines)
250 {
251 bool running;
252
253 if (e.HasScript(item.ItemID, out running))
254 {
255 item.ScriptRunning = running;
256 break;
257 }
258 }
259 }
260 }
261
262 Items.LockItemsForRead(false);
218 } 263 }
219 264
220 /// <summary> 265 /// <summary>
@@ -222,9 +267,14 @@ namespace OpenSim.Region.Framework.Scenes
222 /// </summary> 267 /// </summary>
223 public void CreateScriptInstances(int startParam, bool postOnRez, string engine, int stateSource) 268 public void CreateScriptInstances(int startParam, bool postOnRez, string engine, int stateSource)
224 { 269 {
225 List<TaskInventoryItem> scripts = GetInventoryScripts(); 270 Items.LockItemsForRead(true);
226 foreach (TaskInventoryItem item in scripts) 271 IList<TaskInventoryItem> items = new List<TaskInventoryItem>(Items.Values);
227 CreateScriptInstance(item, startParam, postOnRez, engine, stateSource); 272 Items.LockItemsForRead(false);
273 foreach (TaskInventoryItem item in items)
274 {
275 if ((int)InventoryType.LSL == item.InvType)
276 CreateScriptInstance(item, startParam, postOnRez, engine, stateSource);
277 }
228 } 278 }
229 279
230 public ArrayList GetScriptErrors(UUID itemID) 280 public ArrayList GetScriptErrors(UUID itemID)
@@ -257,9 +307,18 @@ namespace OpenSim.Region.Framework.Scenes
257 /// </param> 307 /// </param>
258 public void RemoveScriptInstances(bool sceneObjectBeingDeleted) 308 public void RemoveScriptInstances(bool sceneObjectBeingDeleted)
259 { 309 {
260 List<TaskInventoryItem> scripts = GetInventoryScripts(); 310 Items.LockItemsForRead(true);
261 foreach (TaskInventoryItem item in scripts) 311 IList<TaskInventoryItem> items = new List<TaskInventoryItem>(Items.Values);
262 RemoveScriptInstance(item.ItemID, sceneObjectBeingDeleted); 312 Items.LockItemsForRead(false);
313
314 foreach (TaskInventoryItem item in items)
315 {
316 if ((int)InventoryType.LSL == item.InvType)
317 {
318 RemoveScriptInstance(item.ItemID, sceneObjectBeingDeleted);
319 m_part.RemoveScriptEvents(item.ItemID);
320 }
321 }
263 } 322 }
264 323
265 /// <summary> 324 /// <summary>
@@ -275,7 +334,10 @@ namespace OpenSim.Region.Framework.Scenes
275 // item.Name, item.ItemID, Name, UUID); 334 // item.Name, item.ItemID, Name, UUID);
276 335
277 if (!m_part.ParentGroup.Scene.Permissions.CanRunScript(item.ItemID, m_part.UUID, item.OwnerID)) 336 if (!m_part.ParentGroup.Scene.Permissions.CanRunScript(item.ItemID, m_part.UUID, item.OwnerID))
337 {
338 StoreScriptError(item.ItemID, "no permission");
278 return; 339 return;
340 }
279 341
280 m_part.AddFlag(PrimFlags.Scripted); 342 m_part.AddFlag(PrimFlags.Scripted);
281 343
@@ -284,14 +346,13 @@ namespace OpenSim.Region.Framework.Scenes
284 if (stateSource == 2 && // Prim crossing 346 if (stateSource == 2 && // Prim crossing
285 m_part.ParentGroup.Scene.m_trustBinaries) 347 m_part.ParentGroup.Scene.m_trustBinaries)
286 { 348 {
287 lock (m_items) 349 m_items.LockItemsForWrite(true);
288 { 350 m_items[item.ItemID].PermsMask = 0;
289 m_items[item.ItemID].PermsMask = 0; 351 m_items[item.ItemID].PermsGranter = UUID.Zero;
290 m_items[item.ItemID].PermsGranter = UUID.Zero; 352 m_items.LockItemsForWrite(false);
291 }
292
293 m_part.ParentGroup.Scene.EventManager.TriggerRezScript( 353 m_part.ParentGroup.Scene.EventManager.TriggerRezScript(
294 m_part.LocalId, item.ItemID, String.Empty, startParam, postOnRez, engine, stateSource); 354 m_part.LocalId, item.ItemID, String.Empty, startParam, postOnRez, engine, stateSource);
355 StoreScriptErrors(item.ItemID, null);
295 m_part.ParentGroup.AddActiveScriptCount(1); 356 m_part.ParentGroup.AddActiveScriptCount(1);
296 m_part.ScheduleFullUpdate(); 357 m_part.ScheduleFullUpdate();
297 return; 358 return;
@@ -300,6 +361,8 @@ namespace OpenSim.Region.Framework.Scenes
300 AssetBase asset = m_part.ParentGroup.Scene.AssetService.Get(item.AssetID.ToString()); 361 AssetBase asset = m_part.ParentGroup.Scene.AssetService.Get(item.AssetID.ToString());
301 if (null == asset) 362 if (null == asset)
302 { 363 {
364 string msg = String.Format("asset ID {0} could not be found", item.AssetID);
365 StoreScriptError(item.ItemID, msg);
303 m_log.ErrorFormat( 366 m_log.ErrorFormat(
304 "[PRIM INVENTORY]: " + 367 "[PRIM INVENTORY]: " +
305 "Couldn't start script {0}, {1} at {2} in {3} since asset ID {4} could not be found", 368 "Couldn't start script {0}, {1} at {2} in {3} since asset ID {4} could not be found",
@@ -311,15 +374,20 @@ namespace OpenSim.Region.Framework.Scenes
311 if (m_part.ParentGroup.m_savedScriptState != null) 374 if (m_part.ParentGroup.m_savedScriptState != null)
312 RestoreSavedScriptState(item.OldItemID, item.ItemID); 375 RestoreSavedScriptState(item.OldItemID, item.ItemID);
313 376
314 lock (m_items) 377 m_items.LockItemsForWrite(true);
315 { 378
316 m_items[item.ItemID].PermsMask = 0; 379 m_items[item.ItemID].PermsMask = 0;
317 m_items[item.ItemID].PermsGranter = UUID.Zero; 380 m_items[item.ItemID].PermsGranter = UUID.Zero;
318 } 381
382 m_items.LockItemsForWrite(false);
319 383
320 string script = Utils.BytesToString(asset.Data); 384 string script = Utils.BytesToString(asset.Data);
321 m_part.ParentGroup.Scene.EventManager.TriggerRezScript( 385 m_part.ParentGroup.Scene.EventManager.TriggerRezScript(
322 m_part.LocalId, item.ItemID, script, startParam, postOnRez, engine, stateSource); 386 m_part.LocalId, item.ItemID, script, startParam, postOnRez, engine, stateSource);
387 StoreScriptErrors(item.ItemID, null);
388 if (!item.ScriptRunning)
389 m_part.ParentGroup.Scene.EventManager.TriggerStopScript(
390 m_part.LocalId, item.ItemID);
323 m_part.ParentGroup.AddActiveScriptCount(1); 391 m_part.ParentGroup.AddActiveScriptCount(1);
324 m_part.ScheduleFullUpdate(); 392 m_part.ScheduleFullUpdate();
325 } 393 }
@@ -383,21 +451,145 @@ namespace OpenSim.Region.Framework.Scenes
383 451
384 /// <summary> 452 /// <summary>
385 /// Start a script which is in this prim's inventory. 453 /// Start a script which is in this prim's inventory.
454 /// Some processing may occur in the background, but this routine returns asap.
386 /// </summary> 455 /// </summary>
387 /// <param name="itemId"> 456 /// <param name="itemId">
388 /// A <see cref="UUID"/> 457 /// A <see cref="UUID"/>
389 /// </param> 458 /// </param>
390 public void CreateScriptInstance(UUID itemId, int startParam, bool postOnRez, string engine, int stateSource) 459 public void CreateScriptInstance(UUID itemId, int startParam, bool postOnRez, string engine, int stateSource)
391 { 460 {
392 TaskInventoryItem item = GetInventoryItem(itemId); 461 lock (m_scriptErrors)
393 if (item != null) 462 {
394 CreateScriptInstance(item, startParam, postOnRez, engine, stateSource); 463 // Indicate to CreateScriptInstanceInternal() we don't want it to wait for completion
464 m_scriptErrors.Remove(itemId);
465 }
466 CreateScriptInstanceInternal(itemId, startParam, postOnRez, engine, stateSource);
467 }
468
469 private void CreateScriptInstanceInternal(UUID itemId, int startParam, bool postOnRez, string engine, int stateSource)
470 {
471 m_items.LockItemsForRead(true);
472 if (m_items.ContainsKey(itemId))
473 {
474 if (m_items.ContainsKey(itemId))
475 {
476 m_items.LockItemsForRead(false);
477 CreateScriptInstance(m_items[itemId], startParam, postOnRez, engine, stateSource);
478 }
479 else
480 {
481 m_items.LockItemsForRead(false);
482 string msg = String.Format("couldn't be found for prim {0}, {1} at {2} in {3}", m_part.Name, m_part.UUID,
483 m_part.AbsolutePosition, m_part.ParentGroup.Scene.RegionInfo.RegionName);
484 StoreScriptError(itemId, msg);
485 m_log.ErrorFormat(
486 "[PRIM INVENTORY]: " +
487 "Couldn't start script with ID {0} since it {1}", itemId, msg);
488 }
489 }
395 else 490 else
491 {
492 m_items.LockItemsForRead(false);
493 string msg = String.Format("couldn't be found for prim {0}, {1}", m_part.Name, m_part.UUID);
494 StoreScriptError(itemId, msg);
396 m_log.ErrorFormat( 495 m_log.ErrorFormat(
397 "[PRIM INVENTORY]: " + 496 "[PRIM INVENTORY]: " +
398 "Couldn't start script with ID {0} since it couldn't be found for prim {1}, {2} at {3} in {4}", 497 "Couldn't start script with ID {0} since it {1}", itemId, msg);
399 itemId, m_part.Name, m_part.UUID, 498 }
400 m_part.AbsolutePosition, m_part.ParentGroup.Scene.RegionInfo.RegionName); 499
500 }
501
502 /// <summary>
503 /// Start a script which is in this prim's inventory and return any compilation error messages.
504 /// </summary>
505 /// <param name="itemId">
506 /// A <see cref="UUID"/>
507 /// </param>
508 public ArrayList CreateScriptInstanceEr(UUID itemId, int startParam, bool postOnRez, string engine, int stateSource)
509 {
510 ArrayList errors;
511
512 // Indicate to CreateScriptInstanceInternal() we want it to
513 // post any compilation/loading error messages
514 lock (m_scriptErrors)
515 {
516 m_scriptErrors[itemId] = null;
517 }
518
519 // Perform compilation/loading
520 CreateScriptInstanceInternal(itemId, startParam, postOnRez, engine, stateSource);
521
522 // Wait for and retrieve any errors
523 lock (m_scriptErrors)
524 {
525 while ((errors = m_scriptErrors[itemId]) == null)
526 {
527 if (!System.Threading.Monitor.Wait(m_scriptErrors, 15000))
528 {
529 m_log.ErrorFormat(
530 "[PRIM INVENTORY]: " +
531 "timedout waiting for script {0} errors", itemId);
532 errors = m_scriptErrors[itemId];
533 if (errors == null)
534 {
535 errors = new ArrayList(1);
536 errors.Add("timedout waiting for errors");
537 }
538 break;
539 }
540 }
541 m_scriptErrors.Remove(itemId);
542 }
543 return errors;
544 }
545
546 // Signal to CreateScriptInstanceEr() that compilation/loading is complete
547 private void StoreScriptErrors(UUID itemId, ArrayList errors)
548 {
549 lock (m_scriptErrors)
550 {
551 // If compilation/loading initiated via CreateScriptInstance(),
552 // it does not want the errors, so just get out
553 if (!m_scriptErrors.ContainsKey(itemId))
554 {
555 return;
556 }
557
558 // Initiated via CreateScriptInstanceEr(), if we know what the
559 // errors are, save them and wake CreateScriptInstanceEr().
560 if (errors != null)
561 {
562 m_scriptErrors[itemId] = errors;
563 System.Threading.Monitor.PulseAll(m_scriptErrors);
564 return;
565 }
566 }
567
568 // Initiated via CreateScriptInstanceEr() but we don't know what
569 // the errors are yet, so retrieve them from the script engine.
570 // This may involve some waiting internal to GetScriptErrors().
571 errors = GetScriptErrors(itemId);
572
573 // Get a default non-null value to indicate success.
574 if (errors == null)
575 {
576 errors = new ArrayList();
577 }
578
579 // Post to CreateScriptInstanceEr() and wake it up
580 lock (m_scriptErrors)
581 {
582 m_scriptErrors[itemId] = errors;
583 System.Threading.Monitor.PulseAll(m_scriptErrors);
584 }
585 }
586
587 // Like StoreScriptErrors(), but just posts a single string message
588 private void StoreScriptError(UUID itemId, string message)
589 {
590 ArrayList errors = new ArrayList(1);
591 errors.Add(message);
592 StoreScriptErrors(itemId, errors);
401 } 593 }
402 594
403 /// <summary> 595 /// <summary>
@@ -410,15 +602,7 @@ namespace OpenSim.Region.Framework.Scenes
410 /// </param> 602 /// </param>
411 public void RemoveScriptInstance(UUID itemId, bool sceneObjectBeingDeleted) 603 public void RemoveScriptInstance(UUID itemId, bool sceneObjectBeingDeleted)
412 { 604 {
413 bool scriptPresent = false; 605 if (m_items.ContainsKey(itemId))
414
415 lock (m_items)
416 {
417 if (m_items.ContainsKey(itemId))
418 scriptPresent = true;
419 }
420
421 if (scriptPresent)
422 { 606 {
423 if (!sceneObjectBeingDeleted) 607 if (!sceneObjectBeingDeleted)
424 m_part.RemoveScriptEvents(itemId); 608 m_part.RemoveScriptEvents(itemId);
@@ -443,14 +627,16 @@ namespace OpenSim.Region.Framework.Scenes
443 /// <returns></returns> 627 /// <returns></returns>
444 private bool InventoryContainsName(string name) 628 private bool InventoryContainsName(string name)
445 { 629 {
446 lock (m_items) 630 m_items.LockItemsForRead(true);
631 foreach (TaskInventoryItem item in m_items.Values)
447 { 632 {
448 foreach (TaskInventoryItem item in m_items.Values) 633 if (item.Name == name)
449 { 634 {
450 if (item.Name == name) 635 m_items.LockItemsForRead(false);
451 return true; 636 return true;
452 } 637 }
453 } 638 }
639 m_items.LockItemsForRead(false);
454 return false; 640 return false;
455 } 641 }
456 642
@@ -492,8 +678,9 @@ namespace OpenSim.Region.Framework.Scenes
492 /// <param name="item"></param> 678 /// <param name="item"></param>
493 public void AddInventoryItemExclusive(TaskInventoryItem item, bool allowedDrop) 679 public void AddInventoryItemExclusive(TaskInventoryItem item, bool allowedDrop)
494 { 680 {
495 List<TaskInventoryItem> il = GetInventoryItems(); 681 m_items.LockItemsForRead(true);
496 682 List<TaskInventoryItem> il = new List<TaskInventoryItem>(m_items.Values);
683 m_items.LockItemsForRead(false);
497 foreach (TaskInventoryItem i in il) 684 foreach (TaskInventoryItem i in il)
498 { 685 {
499 if (i.Name == item.Name) 686 if (i.Name == item.Name)
@@ -531,14 +718,14 @@ namespace OpenSim.Region.Framework.Scenes
531 item.Name = name; 718 item.Name = name;
532 item.GroupID = m_part.GroupID; 719 item.GroupID = m_part.GroupID;
533 720
534 lock (m_items) 721 m_items.LockItemsForWrite(true);
535 m_items.Add(item.ItemID, item); 722 m_items.Add(item.ItemID, item);
536 723 m_items.LockItemsForWrite(false);
537 if (allowedDrop) 724 if (allowedDrop)
538 m_part.TriggerScriptChangedEvent(Changed.ALLOWED_DROP); 725 m_part.TriggerScriptChangedEvent(Changed.ALLOWED_DROP);
539 else 726 else
540 m_part.TriggerScriptChangedEvent(Changed.INVENTORY); 727 m_part.TriggerScriptChangedEvent(Changed.INVENTORY);
541 728
542 m_inventorySerial++; 729 m_inventorySerial++;
543 //m_inventorySerial += 2; 730 //m_inventorySerial += 2;
544 HasInventoryChanged = true; 731 HasInventoryChanged = true;
@@ -554,15 +741,15 @@ namespace OpenSim.Region.Framework.Scenes
554 /// <param name="items"></param> 741 /// <param name="items"></param>
555 public void RestoreInventoryItems(ICollection<TaskInventoryItem> items) 742 public void RestoreInventoryItems(ICollection<TaskInventoryItem> items)
556 { 743 {
557 lock (m_items) 744 m_items.LockItemsForWrite(true);
745 foreach (TaskInventoryItem item in items)
558 { 746 {
559 foreach (TaskInventoryItem item in items) 747 m_items.Add(item.ItemID, item);
560 { 748// m_part.TriggerScriptChangedEvent(Changed.INVENTORY);
561 m_items.Add(item.ItemID, item);
562// m_part.TriggerScriptChangedEvent(Changed.INVENTORY);
563 }
564 m_inventorySerial++;
565 } 749 }
750 m_items.LockItemsForWrite(false);
751
752 m_inventorySerial++;
566 } 753 }
567 754
568 /// <summary> 755 /// <summary>
@@ -573,10 +760,9 @@ namespace OpenSim.Region.Framework.Scenes
573 public TaskInventoryItem GetInventoryItem(UUID itemId) 760 public TaskInventoryItem GetInventoryItem(UUID itemId)
574 { 761 {
575 TaskInventoryItem item; 762 TaskInventoryItem item;
576 763 m_items.LockItemsForRead(true);
577 lock (m_items) 764 m_items.TryGetValue(itemId, out item);
578 m_items.TryGetValue(itemId, out item); 765 m_items.LockItemsForRead(false);
579
580 return item; 766 return item;
581 } 767 }
582 768
@@ -592,15 +778,16 @@ namespace OpenSim.Region.Framework.Scenes
592 { 778 {
593 IList<TaskInventoryItem> items = new List<TaskInventoryItem>(); 779 IList<TaskInventoryItem> items = new List<TaskInventoryItem>();
594 780
595 lock (m_items) 781 m_items.LockItemsForRead(true);
782
783 foreach (TaskInventoryItem item in m_items.Values)
596 { 784 {
597 foreach (TaskInventoryItem item in m_items.Values) 785 if (item.Name == name)
598 { 786 items.Add(item);
599 if (item.Name == name)
600 items.Add(item);
601 }
602 } 787 }
603 788
789 m_items.LockItemsForRead(false);
790
604 return items; 791 return items;
605 } 792 }
606 793
@@ -619,6 +806,9 @@ namespace OpenSim.Region.Framework.Scenes
619 string xmlData = Utils.BytesToString(rezAsset.Data); 806 string xmlData = Utils.BytesToString(rezAsset.Data);
620 SceneObjectGroup group = SceneObjectSerializer.FromOriginalXmlFormat(xmlData); 807 SceneObjectGroup group = SceneObjectSerializer.FromOriginalXmlFormat(xmlData);
621 808
809 group.RootPart.AttachPoint = group.RootPart.Shape.State;
810 group.RootPart.AttachOffset = group.AbsolutePosition;
811
622 group.ResetIDs(); 812 group.ResetIDs();
623 813
624 SceneObjectPart rootPart = group.GetChildPart(group.UUID); 814 SceneObjectPart rootPart = group.GetChildPart(group.UUID);
@@ -693,8 +883,9 @@ namespace OpenSim.Region.Framework.Scenes
693 883
694 public bool UpdateInventoryItem(TaskInventoryItem item, bool fireScriptEvents, bool considerChanged) 884 public bool UpdateInventoryItem(TaskInventoryItem item, bool fireScriptEvents, bool considerChanged)
695 { 885 {
696 TaskInventoryItem it = GetInventoryItem(item.ItemID); 886 m_items.LockItemsForWrite(true);
697 if (it != null) 887
888 if (m_items.ContainsKey(item.ItemID))
698 { 889 {
699// m_log.DebugFormat("[PRIM INVENTORY]: Updating item {0} in {1}", item.Name, m_part.Name); 890// m_log.DebugFormat("[PRIM INVENTORY]: Updating item {0} in {1}", item.Name, m_part.Name);
700 891
@@ -707,14 +898,10 @@ namespace OpenSim.Region.Framework.Scenes
707 item.GroupID = m_part.GroupID; 898 item.GroupID = m_part.GroupID;
708 899
709 if (item.AssetID == UUID.Zero) 900 if (item.AssetID == UUID.Zero)
710 item.AssetID = it.AssetID; 901 item.AssetID = m_items[item.ItemID].AssetID;
711 902
712 lock (m_items) 903 m_items[item.ItemID] = item;
713 { 904 m_inventorySerial++;
714 m_items[item.ItemID] = item;
715 m_inventorySerial++;
716 }
717
718 if (fireScriptEvents) 905 if (fireScriptEvents)
719 m_part.TriggerScriptChangedEvent(Changed.INVENTORY); 906 m_part.TriggerScriptChangedEvent(Changed.INVENTORY);
720 907
@@ -723,7 +910,7 @@ namespace OpenSim.Region.Framework.Scenes
723 HasInventoryChanged = true; 910 HasInventoryChanged = true;
724 m_part.ParentGroup.HasGroupChanged = true; 911 m_part.ParentGroup.HasGroupChanged = true;
725 } 912 }
726 913 m_items.LockItemsForWrite(false);
727 return true; 914 return true;
728 } 915 }
729 else 916 else
@@ -734,8 +921,9 @@ namespace OpenSim.Region.Framework.Scenes
734 item.ItemID, m_part.Name, m_part.UUID, 921 item.ItemID, m_part.Name, m_part.UUID,
735 m_part.AbsolutePosition, m_part.ParentGroup.Scene.RegionInfo.RegionName); 922 m_part.AbsolutePosition, m_part.ParentGroup.Scene.RegionInfo.RegionName);
736 } 923 }
737 return false; 924 m_items.LockItemsForWrite(false);
738 925
926 return false;
739 } 927 }
740 928
741 /// <summary> 929 /// <summary>
@@ -746,43 +934,59 @@ namespace OpenSim.Region.Framework.Scenes
746 /// in this prim's inventory.</returns> 934 /// in this prim's inventory.</returns>
747 public int RemoveInventoryItem(UUID itemID) 935 public int RemoveInventoryItem(UUID itemID)
748 { 936 {
749 TaskInventoryItem item = GetInventoryItem(itemID); 937 m_items.LockItemsForRead(true);
750 if (item != null) 938
939 if (m_items.ContainsKey(itemID))
751 { 940 {
752 int type = m_items[itemID].InvType; 941 int type = m_items[itemID].InvType;
942 m_items.LockItemsForRead(false);
753 if (type == 10) // Script 943 if (type == 10) // Script
754 { 944 {
755 m_part.RemoveScriptEvents(itemID);
756 m_part.ParentGroup.Scene.EventManager.TriggerRemoveScript(m_part.LocalId, itemID); 945 m_part.ParentGroup.Scene.EventManager.TriggerRemoveScript(m_part.LocalId, itemID);
757 } 946 }
947 m_items.LockItemsForWrite(true);
758 m_items.Remove(itemID); 948 m_items.Remove(itemID);
949 m_items.LockItemsForWrite(false);
759 m_inventorySerial++; 950 m_inventorySerial++;
760 m_part.TriggerScriptChangedEvent(Changed.INVENTORY); 951 m_part.TriggerScriptChangedEvent(Changed.INVENTORY);
761 952
762 HasInventoryChanged = true; 953 HasInventoryChanged = true;
763 m_part.ParentGroup.HasGroupChanged = true; 954 m_part.ParentGroup.HasGroupChanged = true;
764 955
765 if (!ContainsScripts()) 956 int scriptcount = 0;
957 m_items.LockItemsForRead(true);
958 foreach (TaskInventoryItem item in m_items.Values)
959 {
960 if (item.Type == 10)
961 {
962 scriptcount++;
963 }
964 }
965 m_items.LockItemsForRead(false);
966
967
968 if (scriptcount <= 0)
969 {
766 m_part.RemFlag(PrimFlags.Scripted); 970 m_part.RemFlag(PrimFlags.Scripted);
971 }
767 972
768 m_part.ScheduleFullUpdate(); 973 m_part.ScheduleFullUpdate();
769 974
770 return type; 975 return type;
771
772 } 976 }
773 else 977 else
774 { 978 {
979 m_items.LockItemsForRead(false);
775 m_log.ErrorFormat( 980 m_log.ErrorFormat(
776 "[PRIM INVENTORY]: " + 981 "[PRIM INVENTORY]: " +
777 "Tried to remove item ID {0} from prim {1}, {2} at {3} in {4} but the item does not exist in this inventory", 982 "Tried to remove item ID {0} from prim {1}, {2} but the item does not exist in this inventory",
778 itemID, m_part.Name, m_part.UUID, 983 itemID, m_part.Name, m_part.UUID);
779 m_part.AbsolutePosition, m_part.ParentGroup.Scene.RegionInfo.RegionName);
780 } 984 }
781 985
782 return -1; 986 return -1;
783 } 987 }
784 988
785 private bool CreateInventoryFile() 989 private bool CreateInventoryFileName()
786 { 990 {
787// m_log.DebugFormat( 991// m_log.DebugFormat(
788// "[PRIM INVENTORY]: Creating inventory file for {0} {1} {2}, serial {3}", 992// "[PRIM INVENTORY]: Creating inventory file for {0} {1} {2}, serial {3}",
@@ -791,116 +995,125 @@ namespace OpenSim.Region.Framework.Scenes
791 if (m_inventoryFileName == String.Empty || 995 if (m_inventoryFileName == String.Empty ||
792 m_inventoryFileNameSerial < m_inventorySerial) 996 m_inventoryFileNameSerial < m_inventorySerial)
793 { 997 {
794 // Something changed, we need to create a new file
795 m_inventoryFileName = "inventory_" + UUID.Random().ToString() + ".tmp"; 998 m_inventoryFileName = "inventory_" + UUID.Random().ToString() + ".tmp";
796 m_inventoryFileNameSerial = m_inventorySerial; 999 m_inventoryFileNameSerial = m_inventorySerial;
797 1000
798 InventoryStringBuilder invString = new InventoryStringBuilder(m_part.UUID, UUID.Zero); 1001 return true;
1002 }
1003
1004 return false;
1005 }
1006
1007 /// <summary>
1008 /// Serialize all the metadata for the items in this prim's inventory ready for sending to the client
1009 /// </summary>
1010 /// <param name="xferManager"></param>
1011 public void RequestInventoryFile(IClientAPI client, IXfer xferManager)
1012 {
1013 bool changed = CreateInventoryFileName();
1014
1015 bool includeAssets = false;
1016 if (m_part.ParentGroup.Scene.Permissions.CanEditObjectInventory(m_part.UUID, client.AgentId))
1017 includeAssets = true;
1018
1019 if (m_inventoryPrivileged != includeAssets)
1020 changed = true;
1021
1022 InventoryStringBuilder invString = new InventoryStringBuilder(m_part.UUID, UUID.Zero);
1023
1024 Items.LockItemsForRead(true);
1025
1026 if (m_inventorySerial == 0) // No inventory
1027 {
1028 client.SendTaskInventory(m_part.UUID, 0, new byte[0]);
1029 Items.LockItemsForRead(false);
1030 return;
1031 }
799 1032
800 lock (m_items) 1033 if (m_items.Count == 0) // No inventory
1034 {
1035 client.SendTaskInventory(m_part.UUID, 0, new byte[0]);
1036 Items.LockItemsForRead(false);
1037 return;
1038 }
1039
1040 if (!changed)
1041 {
1042 if (m_inventoryFileData.Length > 2)
801 { 1043 {
802 foreach (TaskInventoryItem item in m_items.Values) 1044 xferManager.AddNewFile(m_inventoryFileName,
803 { 1045 m_inventoryFileData);
804// m_log.DebugFormat( 1046 client.SendTaskInventory(m_part.UUID, (short)m_inventorySerial,
805// "[PRIM INVENTORY]: Adding item {0} {1} for serial {2} on prim {3} {4} {5}", 1047 Util.StringToBytes256(m_inventoryFileName));
806// item.Name, item.ItemID, m_inventorySerial, m_part.Name, m_part.UUID, m_part.LocalId);
807 1048
808 UUID ownerID = item.OwnerID; 1049 Items.LockItemsForRead(false);
809 uint everyoneMask = 0; 1050 return;
810 uint baseMask = item.BasePermissions; 1051 }
811 uint ownerMask = item.CurrentPermissions; 1052 }
812 uint groupMask = item.GroupPermissions;
813 1053
814 invString.AddItemStart(); 1054 m_inventoryPrivileged = includeAssets;
815 invString.AddNameValueLine("item_id", item.ItemID.ToString());
816 invString.AddNameValueLine("parent_id", m_part.UUID.ToString());
817 1055
818 invString.AddPermissionsStart(); 1056 foreach (TaskInventoryItem item in m_items.Values)
1057 {
1058 UUID ownerID = item.OwnerID;
1059 uint everyoneMask = 0;
1060 uint baseMask = item.BasePermissions;
1061 uint ownerMask = item.CurrentPermissions;
1062 uint groupMask = item.GroupPermissions;
819 1063
820 invString.AddNameValueLine("base_mask", Utils.UIntToHexString(baseMask)); 1064 invString.AddItemStart();
821 invString.AddNameValueLine("owner_mask", Utils.UIntToHexString(ownerMask)); 1065 invString.AddNameValueLine("item_id", item.ItemID.ToString());
822 invString.AddNameValueLine("group_mask", Utils.UIntToHexString(groupMask)); 1066 invString.AddNameValueLine("parent_id", m_part.UUID.ToString());
823 invString.AddNameValueLine("everyone_mask", Utils.UIntToHexString(everyoneMask));
824 invString.AddNameValueLine("next_owner_mask", Utils.UIntToHexString(item.NextPermissions));
825 1067
826 invString.AddNameValueLine("creator_id", item.CreatorID.ToString()); 1068 invString.AddPermissionsStart();
827 invString.AddNameValueLine("owner_id", ownerID.ToString());
828 1069
829 invString.AddNameValueLine("last_owner_id", item.LastOwnerID.ToString()); 1070 invString.AddNameValueLine("base_mask", Utils.UIntToHexString(baseMask));
1071 invString.AddNameValueLine("owner_mask", Utils.UIntToHexString(ownerMask));
1072 invString.AddNameValueLine("group_mask", Utils.UIntToHexString(groupMask));
1073 invString.AddNameValueLine("everyone_mask", Utils.UIntToHexString(everyoneMask));
1074 invString.AddNameValueLine("next_owner_mask", Utils.UIntToHexString(item.NextPermissions));
830 1075
831 invString.AddNameValueLine("group_id", item.GroupID.ToString()); 1076 invString.AddNameValueLine("creator_id", item.CreatorID.ToString());
832 invString.AddSectionEnd(); 1077 invString.AddNameValueLine("owner_id", ownerID.ToString());
833 1078
834 invString.AddNameValueLine("asset_id", item.AssetID.ToString()); 1079 invString.AddNameValueLine("last_owner_id", item.LastOwnerID.ToString());
835 invString.AddNameValueLine("type", TaskInventoryItem.Types[item.Type]);
836 invString.AddNameValueLine("inv_type", TaskInventoryItem.InvTypes[item.InvType]);
837 invString.AddNameValueLine("flags", Utils.UIntToHexString(item.Flags));
838 1080
839 invString.AddSaleStart(); 1081 invString.AddNameValueLine("group_id", item.GroupID.ToString());
840 invString.AddNameValueLine("sale_type", "not"); 1082 invString.AddSectionEnd();
841 invString.AddNameValueLine("sale_price", "0");
842 invString.AddSectionEnd();
843 1083
844 invString.AddNameValueLine("name", item.Name + "|"); 1084 if (includeAssets)
845 invString.AddNameValueLine("desc", item.Description + "|"); 1085 invString.AddNameValueLine("asset_id", item.AssetID.ToString());
1086 else
1087 invString.AddNameValueLine("asset_id", UUID.Zero.ToString());
1088 invString.AddNameValueLine("type", TaskInventoryItem.Types[item.Type]);
1089 invString.AddNameValueLine("inv_type", TaskInventoryItem.InvTypes[item.InvType]);
1090 invString.AddNameValueLine("flags", Utils.UIntToHexString(item.Flags));
846 1091
847 invString.AddNameValueLine("creation_date", item.CreationDate.ToString()); 1092 invString.AddSaleStart();
848 invString.AddSectionEnd(); 1093 invString.AddNameValueLine("sale_type", "not");
849 } 1094 invString.AddNameValueLine("sale_price", "0");
850 } 1095 invString.AddSectionEnd();
851 1096
852 m_inventoryFileData = Utils.StringToBytes(invString.BuildString); 1097 invString.AddNameValueLine("name", item.Name + "|");
1098 invString.AddNameValueLine("desc", item.Description + "|");
853 1099
854 return true; 1100 invString.AddNameValueLine("creation_date", item.CreationDate.ToString());
1101 invString.AddSectionEnd();
855 } 1102 }
856 1103
857 // No need to recreate, the existing file is fine 1104 Items.LockItemsForRead(false);
858 return false;
859 }
860 1105
861 /// <summary> 1106 m_inventoryFileData = Utils.StringToBytes(invString.BuildString);
862 /// Serialize all the metadata for the items in this prim's inventory ready for sending to the client
863 /// </summary>
864 /// <param name="xferManager"></param>
865 public void RequestInventoryFile(IClientAPI client, IXfer xferManager)
866 {
867 lock (m_items)
868 {
869 // Don't send a inventory xfer name if there are no items. Doing so causes viewer 3 to crash when rezzing
870 // a new script if any previous deletion has left the prim inventory empty.
871 if (m_items.Count == 0) // No inventory
872 {
873// m_log.DebugFormat(
874// "[PRIM INVENTORY]: Not sending inventory data for part {0} {1} {2} for {3} since no items",
875// m_part.Name, m_part.LocalId, m_part.UUID, client.Name);
876 1107
877 client.SendTaskInventory(m_part.UUID, 0, new byte[0]); 1108 if (m_inventoryFileData.Length > 2)
878 return; 1109 {
879 } 1110 xferManager.AddNewFile(m_inventoryFileName, m_inventoryFileData);
880 1111 client.SendTaskInventory(m_part.UUID, (short)m_inventorySerial,
881 CreateInventoryFile(); 1112 Util.StringToBytes256(m_inventoryFileName));
882 1113 return;
883 // In principle, we should only do the rest if the inventory changed;
884 // by sending m_inventorySerial to the client, it ought to know
885 // that nothing changed and that it doesn't need to request the file.
886 // Unfortunately, it doesn't look like the client optimizes this;
887 // the client seems to always come back and request the Xfer,
888 // no matter what value m_inventorySerial has.
889 // FIXME: Could probably be > 0 here rather than > 2
890 if (m_inventoryFileData.Length > 2)
891 {
892 // Add the file for Xfer
893 // m_log.DebugFormat(
894 // "[PRIM INVENTORY]: Adding inventory file {0} (length {1}) for transfer on {2} {3} {4}",
895 // m_inventoryFileName, m_inventoryFileData.Length, m_part.Name, m_part.UUID, m_part.LocalId);
896
897 xferManager.AddNewFile(m_inventoryFileName, m_inventoryFileData);
898 }
899
900 // Tell the client we're ready to Xfer the file
901 client.SendTaskInventory(m_part.UUID, (short)m_inventorySerial,
902 Util.StringToBytes256(m_inventoryFileName));
903 } 1114 }
1115
1116 client.SendTaskInventory(m_part.UUID, 0, new byte[0]);
904 } 1117 }
905 1118
906 /// <summary> 1119 /// <summary>
@@ -911,10 +1124,11 @@ namespace OpenSim.Region.Framework.Scenes
911 { 1124 {
912 if (HasInventoryChanged) 1125 if (HasInventoryChanged)
913 { 1126 {
914 HasInventoryChanged = false; 1127 Items.LockItemsForRead(true);
915 List<TaskInventoryItem> items = GetInventoryItems(); 1128 datastore.StorePrimInventory(m_part.UUID, Items.Values);
916 datastore.StorePrimInventory(m_part.UUID, items); 1129 Items.LockItemsForRead(false);
917 1130
1131 HasInventoryChanged = false;
918 } 1132 }
919 } 1133 }
920 1134
@@ -981,82 +1195,63 @@ namespace OpenSim.Region.Framework.Scenes
981 { 1195 {
982 uint mask=0x7fffffff; 1196 uint mask=0x7fffffff;
983 1197
984 lock (m_items) 1198 foreach (TaskInventoryItem item in m_items.Values)
985 { 1199 {
986 foreach (TaskInventoryItem item in m_items.Values) 1200 if ((item.CurrentPermissions & item.NextPermissions & (uint)PermissionMask.Copy) == 0)
1201 mask &= ~((uint)PermissionMask.Copy >> 13);
1202 if ((item.CurrentPermissions & item.NextPermissions & (uint)PermissionMask.Transfer) == 0)
1203 mask &= ~((uint)PermissionMask.Transfer >> 13);
1204 if ((item.CurrentPermissions & item.NextPermissions & (uint)PermissionMask.Modify) == 0)
1205 mask &= ~((uint)PermissionMask.Modify >> 13);
1206
1207 if (item.InvType == (int)InventoryType.Object)
987 { 1208 {
988 if ((item.CurrentPermissions & item.NextPermissions & (uint)PermissionMask.Copy) == 0) 1209 if ((item.CurrentPermissions & ((uint)PermissionMask.Copy >> 13)) == 0)
989 mask &= ~((uint)PermissionMask.Copy >> 13); 1210 mask &= ~((uint)PermissionMask.Copy >> 13);
990 if ((item.CurrentPermissions & item.NextPermissions & (uint)PermissionMask.Transfer) == 0) 1211 if ((item.CurrentPermissions & ((uint)PermissionMask.Transfer >> 13)) == 0)
991 mask &= ~((uint)PermissionMask.Transfer >> 13); 1212 mask &= ~((uint)PermissionMask.Transfer >> 13);
992 if ((item.CurrentPermissions & item.NextPermissions & (uint)PermissionMask.Modify) == 0) 1213 if ((item.CurrentPermissions & ((uint)PermissionMask.Modify >> 13)) == 0)
993 mask &= ~((uint)PermissionMask.Modify >> 13); 1214 mask &= ~((uint)PermissionMask.Modify >> 13);
994
995 if (item.InvType != (int)InventoryType.Object)
996 {
997 if ((item.CurrentPermissions & item.NextPermissions & (uint)PermissionMask.Copy) == 0)
998 mask &= ~((uint)PermissionMask.Copy >> 13);
999 if ((item.CurrentPermissions & item.NextPermissions & (uint)PermissionMask.Transfer) == 0)
1000 mask &= ~((uint)PermissionMask.Transfer >> 13);
1001 if ((item.CurrentPermissions & item.NextPermissions & (uint)PermissionMask.Modify) == 0)
1002 mask &= ~((uint)PermissionMask.Modify >> 13);
1003 }
1004 else
1005 {
1006 if ((item.CurrentPermissions & ((uint)PermissionMask.Copy >> 13)) == 0)
1007 mask &= ~((uint)PermissionMask.Copy >> 13);
1008 if ((item.CurrentPermissions & ((uint)PermissionMask.Transfer >> 13)) == 0)
1009 mask &= ~((uint)PermissionMask.Transfer >> 13);
1010 if ((item.CurrentPermissions & ((uint)PermissionMask.Modify >> 13)) == 0)
1011 mask &= ~((uint)PermissionMask.Modify >> 13);
1012 }
1013
1014 if ((item.CurrentPermissions & (uint)PermissionMask.Copy) == 0)
1015 mask &= ~(uint)PermissionMask.Copy;
1016 if ((item.CurrentPermissions & (uint)PermissionMask.Transfer) == 0)
1017 mask &= ~(uint)PermissionMask.Transfer;
1018 if ((item.CurrentPermissions & (uint)PermissionMask.Modify) == 0)
1019 mask &= ~(uint)PermissionMask.Modify;
1020 } 1215 }
1216
1217 if ((item.CurrentPermissions & (uint)PermissionMask.Copy) == 0)
1218 mask &= ~(uint)PermissionMask.Copy;
1219 if ((item.CurrentPermissions & (uint)PermissionMask.Transfer) == 0)
1220 mask &= ~(uint)PermissionMask.Transfer;
1221 if ((item.CurrentPermissions & (uint)PermissionMask.Modify) == 0)
1222 mask &= ~(uint)PermissionMask.Modify;
1021 } 1223 }
1022
1023 return mask; 1224 return mask;
1024 } 1225 }
1025 1226
1026 public void ApplyNextOwnerPermissions() 1227 public void ApplyNextOwnerPermissions()
1027 { 1228 {
1028 lock (m_items) 1229 foreach (TaskInventoryItem item in m_items.Values)
1029 { 1230 {
1030 foreach (TaskInventoryItem item in m_items.Values) 1231 if (item.InvType == (int)InventoryType.Object && (item.CurrentPermissions & 7) != 0)
1031 { 1232 {
1032 if (item.InvType == (int)InventoryType.Object && (item.CurrentPermissions & 7) != 0) 1233 if ((item.CurrentPermissions & ((uint)PermissionMask.Copy >> 13)) == 0)
1033 { 1234 item.CurrentPermissions &= ~(uint)PermissionMask.Copy;
1034 if ((item.CurrentPermissions & ((uint)PermissionMask.Copy >> 13)) == 0) 1235 if ((item.CurrentPermissions & ((uint)PermissionMask.Transfer >> 13)) == 0)
1035 item.CurrentPermissions &= ~(uint)PermissionMask.Copy; 1236 item.CurrentPermissions &= ~(uint)PermissionMask.Transfer;
1036 if ((item.CurrentPermissions & ((uint)PermissionMask.Transfer >> 13)) == 0) 1237 if ((item.CurrentPermissions & ((uint)PermissionMask.Modify >> 13)) == 0)
1037 item.CurrentPermissions &= ~(uint)PermissionMask.Transfer; 1238 item.CurrentPermissions &= ~(uint)PermissionMask.Modify;
1038 if ((item.CurrentPermissions & ((uint)PermissionMask.Modify >> 13)) == 0)
1039 item.CurrentPermissions &= ~(uint)PermissionMask.Modify;
1040 }
1041 item.CurrentPermissions &= item.NextPermissions;
1042 item.BasePermissions &= item.NextPermissions;
1043 item.EveryonePermissions &= item.NextPermissions;
1044 item.OwnerChanged = true;
1045 item.PermsMask = 0;
1046 item.PermsGranter = UUID.Zero;
1047 } 1239 }
1240 item.OwnerChanged = true;
1241 item.CurrentPermissions &= item.NextPermissions;
1242 item.BasePermissions &= item.NextPermissions;
1243 item.EveryonePermissions &= item.NextPermissions;
1244 item.PermsMask = 0;
1245 item.PermsGranter = UUID.Zero;
1048 } 1246 }
1049 } 1247 }
1050 1248
1051 public void ApplyGodPermissions(uint perms) 1249 public void ApplyGodPermissions(uint perms)
1052 { 1250 {
1053 lock (m_items) 1251 foreach (TaskInventoryItem item in m_items.Values)
1054 { 1252 {
1055 foreach (TaskInventoryItem item in m_items.Values) 1253 item.CurrentPermissions = perms;
1056 { 1254 item.BasePermissions = perms;
1057 item.CurrentPermissions = perms;
1058 item.BasePermissions = perms;
1059 }
1060 } 1255 }
1061 1256
1062 m_inventorySerial++; 1257 m_inventorySerial++;
@@ -1069,17 +1264,13 @@ namespace OpenSim.Region.Framework.Scenes
1069 /// <returns></returns> 1264 /// <returns></returns>
1070 public bool ContainsScripts() 1265 public bool ContainsScripts()
1071 { 1266 {
1072 lock (m_items) 1267 foreach (TaskInventoryItem item in m_items.Values)
1073 { 1268 {
1074 foreach (TaskInventoryItem item in m_items.Values) 1269 if (item.InvType == (int)InventoryType.LSL)
1075 { 1270 {
1076 if (item.InvType == (int)InventoryType.LSL) 1271 return true;
1077 {
1078 return true;
1079 }
1080 } 1272 }
1081 } 1273 }
1082
1083 return false; 1274 return false;
1084 } 1275 }
1085 1276
@@ -1087,11 +1278,8 @@ namespace OpenSim.Region.Framework.Scenes
1087 { 1278 {
1088 List<UUID> ret = new List<UUID>(); 1279 List<UUID> ret = new List<UUID>();
1089 1280
1090 lock (m_items) 1281 foreach (TaskInventoryItem item in m_items.Values)
1091 { 1282 ret.Add(item.ItemID);
1092 foreach (TaskInventoryItem item in m_items.Values)
1093 ret.Add(item.ItemID);
1094 }
1095 1283
1096 return ret; 1284 return ret;
1097 } 1285 }
@@ -1122,6 +1310,11 @@ namespace OpenSim.Region.Framework.Scenes
1122 1310
1123 public Dictionary<UUID, string> GetScriptStates() 1311 public Dictionary<UUID, string> GetScriptStates()
1124 { 1312 {
1313 return GetScriptStates(false);
1314 }
1315
1316 public Dictionary<UUID, string> GetScriptStates(bool oldIDs)
1317 {
1125 Dictionary<UUID, string> ret = new Dictionary<UUID, string>(); 1318 Dictionary<UUID, string> ret = new Dictionary<UUID, string>();
1126 1319
1127 if (m_part.ParentGroup.Scene == null) // Group not in a scene 1320 if (m_part.ParentGroup.Scene == null) // Group not in a scene
@@ -1132,25 +1325,35 @@ namespace OpenSim.Region.Framework.Scenes
1132 if (engines == null) // No engine at all 1325 if (engines == null) // No engine at all
1133 return ret; 1326 return ret;
1134 1327
1135 List<TaskInventoryItem> scripts = GetInventoryScripts(); 1328 Items.LockItemsForRead(true);
1136 1329 foreach (TaskInventoryItem item in m_items.Values)
1137 foreach (TaskInventoryItem item in scripts)
1138 { 1330 {
1139 foreach (IScriptModule e in engines) 1331 if (item.InvType == (int)InventoryType.LSL)
1140 { 1332 {
1141 if (e != null) 1333 foreach (IScriptModule e in engines)
1142 { 1334 {
1143 string n = e.GetXMLState(item.ItemID); 1335 if (e != null)
1144 if (n != String.Empty)
1145 { 1336 {
1146 if (!ret.ContainsKey(item.ItemID)) 1337 string n = e.GetXMLState(item.ItemID);
1147 ret[item.ItemID] = n; 1338 if (n != String.Empty)
1148 break; 1339 {
1340 if (oldIDs)
1341 {
1342 if (!ret.ContainsKey(item.OldItemID))
1343 ret[item.OldItemID] = n;
1344 }
1345 else
1346 {
1347 if (!ret.ContainsKey(item.ItemID))
1348 ret[item.ItemID] = n;
1349 }
1350 break;
1351 }
1149 } 1352 }
1150 } 1353 }
1151 } 1354 }
1152 } 1355 }
1153 1356 Items.LockItemsForRead(false);
1154 return ret; 1357 return ret;
1155 } 1358 }
1156 1359
@@ -1160,21 +1363,27 @@ namespace OpenSim.Region.Framework.Scenes
1160 if (engines == null) 1363 if (engines == null)
1161 return; 1364 return;
1162 1365
1163 List<TaskInventoryItem> scripts = GetInventoryScripts();
1164 1366
1165 foreach (TaskInventoryItem item in scripts) 1367 Items.LockItemsForRead(true);
1368
1369 foreach (TaskInventoryItem item in m_items.Values)
1166 { 1370 {
1167 foreach (IScriptModule engine in engines) 1371 if (item.InvType == (int)InventoryType.LSL)
1168 { 1372 {
1169 if (engine != null) 1373 foreach (IScriptModule engine in engines)
1170 { 1374 {
1171 if (item.OwnerChanged) 1375 if (engine != null)
1172 engine.PostScriptEvent(item.ItemID, "changed", new Object[] { (int)Changed.OWNER }); 1376 {
1173 item.OwnerChanged = false; 1377 if (item.OwnerChanged)
1174 engine.ResumeScript(item.ItemID); 1378 engine.PostScriptEvent(item.ItemID, "changed", new Object[] { (int)Changed.OWNER });
1379 item.OwnerChanged = false;
1380 engine.ResumeScript(item.ItemID);
1381 }
1175 } 1382 }
1176 } 1383 }
1177 } 1384 }
1385
1386 Items.LockItemsForRead(false);
1178 } 1387 }
1179 } 1388 }
1180} 1389}
diff --git a/OpenSim/Region/Framework/Scenes/ScenePresence.cs b/OpenSim/Region/Framework/Scenes/ScenePresence.cs
index 29966f9..bba746f 100644
--- a/OpenSim/Region/Framework/Scenes/ScenePresence.cs
+++ b/OpenSim/Region/Framework/Scenes/ScenePresence.cs
@@ -26,6 +26,7 @@
26 */ 26 */
27 27
28using System; 28using System;
29using System.Xml;
29using System.Collections.Generic; 30using System.Collections.Generic;
30using System.Reflection; 31using System.Reflection;
31using System.Timers; 32using System.Timers;
@@ -72,7 +73,7 @@ namespace OpenSim.Region.Framework.Scenes
72// { 73// {
73// m_log.Debug("[SCENE PRESENCE] Destructor called"); 74// m_log.Debug("[SCENE PRESENCE] Destructor called");
74// } 75// }
75 76
76 private static readonly ILog m_log = LogManager.GetLogger(MethodBase.GetCurrentMethod().DeclaringType); 77 private static readonly ILog m_log = LogManager.GetLogger(MethodBase.GetCurrentMethod().DeclaringType);
77 78
78 public PresenceType PresenceType { get; private set; } 79 public PresenceType PresenceType { get; private set; }
@@ -89,7 +90,9 @@ namespace OpenSim.Region.Framework.Scenes
89 /// 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
90 /// issue #1716 91 /// issue #1716
91 /// </summary> 92 /// </summary>
92 private static readonly Vector3 SIT_TARGET_ADJUSTMENT = new Vector3(0.1f, 0.0f, 0.3f); 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 private static readonly Vector3 SIT_TARGET_ADJUSTMENT = new Vector3(0.0f, 0.0f, 0.418f);
93 96
94 /// <summary> 97 /// <summary>
95 /// Movement updates for agents in neighboring regions are sent directly to clients. 98 /// Movement updates for agents in neighboring regions are sent directly to clients.
@@ -117,6 +120,7 @@ namespace OpenSim.Region.Framework.Scenes
117 /// TODO: For some reason, we effectively have a list both here and in Appearance. Need to work out if this is 120 /// TODO: For some reason, we effectively have a list both here and in Appearance. Need to work out if this is
118 /// necessary. 121 /// necessary.
119 /// </remarks> 122 /// </remarks>
123
120 protected List<SceneObjectGroup> m_attachments = new List<SceneObjectGroup>(); 124 protected List<SceneObjectGroup> m_attachments = new List<SceneObjectGroup>();
121 125
122 public Object AttachmentsSyncLock { get; private set; } 126 public Object AttachmentsSyncLock { get; private set; }
@@ -130,13 +134,21 @@ namespace OpenSim.Region.Framework.Scenes
130 public Vector3 lastKnownAllowedPosition; 134 public Vector3 lastKnownAllowedPosition;
131 public bool sentMessageAboutRestrictedParcelFlyingDown; 135 public bool sentMessageAboutRestrictedParcelFlyingDown;
132 public Vector4 CollisionPlane = Vector4.UnitW; 136 public Vector4 CollisionPlane = Vector4.UnitW;
133 137
138 private Vector3 m_avInitialPos; // used to calculate unscripted sit rotation
139 private Vector3 m_avUnscriptedSitPos; // for non-scripted prims
134 private Vector3 m_lastPosition; 140 private Vector3 m_lastPosition;
141 private Vector3 m_lastWorldPosition;
135 private Quaternion m_lastRotation; 142 private Quaternion m_lastRotation;
136 private Vector3 m_lastVelocity; 143 private Vector3 m_lastVelocity;
137 //private int m_lastTerseSent; 144 //private int m_lastTerseSent;
138 145
139 private Vector3? m_forceToApply; 146 private Vector3? m_forceToApply;
147 private int m_userFlags;
148 public int UserFlags
149 {
150 get { return m_userFlags; }
151 }
140 private TeleportFlags m_teleportFlags; 152 private TeleportFlags m_teleportFlags;
141 public TeleportFlags TeleportFlags 153 public TeleportFlags TeleportFlags
142 { 154 {
@@ -159,6 +171,9 @@ namespace OpenSim.Region.Framework.Scenes
159 private Vector3 m_lastChildAgentUpdatePosition; 171 private Vector3 m_lastChildAgentUpdatePosition;
160 private Vector3 m_lastChildAgentUpdateCamPosition; 172 private Vector3 m_lastChildAgentUpdateCamPosition;
161 173
174 private bool m_flyingOld; // add for fly velocity control
175 public bool m_wasFlying; // add for fly velocity control
176
162 private const int LAND_VELOCITYMAG_MAX = 12; 177 private const int LAND_VELOCITYMAG_MAX = 12;
163 178
164 public bool IsRestrictedToRegion; 179 public bool IsRestrictedToRegion;
@@ -169,7 +184,7 @@ namespace OpenSim.Region.Framework.Scenes
169 184
170 protected ulong crossingFromRegion; 185 protected ulong crossingFromRegion;
171 186
172 private readonly Vector3[] Dir_Vectors = new Vector3[9]; 187 private readonly Vector3[] Dir_Vectors = new Vector3[11];
173 188
174 189
175 protected Timer m_reprioritization_timer; 190 protected Timer m_reprioritization_timer;
@@ -184,12 +199,14 @@ namespace OpenSim.Region.Framework.Scenes
184 private bool m_autopilotMoving; 199 private bool m_autopilotMoving;
185 private Vector3 m_autoPilotTarget; 200 private Vector3 m_autoPilotTarget;
186 private bool m_sitAtAutoTarget; 201 private bool m_sitAtAutoTarget;
202 private Vector3 m_initialSitTarget = Vector3.Zero; //KF: First estimate of where to sit
187 203
188 private string m_nextSitAnimation = String.Empty; 204 private string m_nextSitAnimation = String.Empty;
189 205
190 //PauPaw:Proper PID Controler for autopilot************ 206 //PauPaw:Proper PID Controler for autopilot************
191 public bool MovingToTarget { get; private set; } 207 public bool MovingToTarget { get; private set; }
192 public Vector3 MoveToPositionTarget { get; private set; } 208 public Vector3 MoveToPositionTarget { get; private set; }
209 private Quaternion m_offsetRotation = new Quaternion(0.0f, 0.0f, 0.0f, 1.0f);
193 210
194 /// <summary> 211 /// <summary>
195 /// Controls whether an avatar automatically moving to a target will land when it gets there (if flying). 212 /// Controls whether an avatar automatically moving to a target will land when it gets there (if flying).
@@ -199,7 +216,13 @@ namespace OpenSim.Region.Framework.Scenes
199 private bool m_followCamAuto; 216 private bool m_followCamAuto;
200 217
201 private int m_movementUpdateCount; 218 private int m_movementUpdateCount;
219 private int m_lastColCount = -1; //KF: Look for Collision chnages
220 private int m_updateCount = 0; //KF: Update Anims for a while
221 private static readonly int UPDATE_COUNT = 10; // how many frames to update for
202 private const int NumMovementsBetweenRayCast = 5; 222 private const int NumMovementsBetweenRayCast = 5;
223 private List<uint> m_lastColliders = new List<uint>();
224
225 private object m_syncRoot = new Object();
203 226
204 private bool CameraConstraintActive; 227 private bool CameraConstraintActive;
205 //private int m_moveToPositionStateStatus; 228 //private int m_moveToPositionStateStatus;
@@ -240,7 +263,9 @@ namespace OpenSim.Region.Framework.Scenes
240 DIR_CONTROL_FLAG_UP = AgentManager.ControlFlags.AGENT_CONTROL_UP_POS, 263 DIR_CONTROL_FLAG_UP = AgentManager.ControlFlags.AGENT_CONTROL_UP_POS,
241 DIR_CONTROL_FLAG_DOWN = AgentManager.ControlFlags.AGENT_CONTROL_UP_NEG, 264 DIR_CONTROL_FLAG_DOWN = AgentManager.ControlFlags.AGENT_CONTROL_UP_NEG,
242 DIR_CONTROL_FLAG_FORWARD_NUDGE = AgentManager.ControlFlags.AGENT_CONTROL_NUDGE_AT_POS, 265 DIR_CONTROL_FLAG_FORWARD_NUDGE = AgentManager.ControlFlags.AGENT_CONTROL_NUDGE_AT_POS,
243 DIR_CONTROL_FLAG_BACKWARD_NUDGE = AgentManager.ControlFlags.AGENT_CONTROL_NUDGE_AT_NEG, 266 DIR_CONTROL_FLAG_BACK_NUDGE = AgentManager.ControlFlags.AGENT_CONTROL_NUDGE_AT_NEG,
267 DIR_CONTROL_FLAG_LEFT_NUDGE = AgentManager.ControlFlags.AGENT_CONTROL_NUDGE_LEFT_POS,
268 DIR_CONTROL_FLAG_RIGHT_NUDGE = AgentManager.ControlFlags.AGENT_CONTROL_NUDGE_LEFT_NEG,
244 DIR_CONTROL_FLAG_DOWN_NUDGE = AgentManager.ControlFlags.AGENT_CONTROL_NUDGE_UP_NEG 269 DIR_CONTROL_FLAG_DOWN_NUDGE = AgentManager.ControlFlags.AGENT_CONTROL_NUDGE_UP_NEG
245 } 270 }
246 271
@@ -476,9 +501,11 @@ namespace OpenSim.Region.Framework.Scenes
476 { 501 {
477 get 502 get
478 { 503 {
479 if (PhysicsActor != null) 504 PhysicsActor actor = m_physicsActor;
480 { 505// if (actor != null)
481 m_pos = PhysicsActor.Position; 506 if ((actor != null) && (m_parentID == 0)) // KF Do NOT update m_pos here if Av is sitting!
507 {
508 m_pos = actor.Position;
482 509
483// m_log.DebugFormat( 510// m_log.DebugFormat(
484// "[SCENE PRESENCE]: Set position {0} for {1} in {2} via getting AbsolutePosition!", 511// "[SCENE PRESENCE]: Set position {0} for {1} in {2} via getting AbsolutePosition!",
@@ -504,7 +531,7 @@ namespace OpenSim.Region.Framework.Scenes
504 SceneObjectPart part = m_scene.GetSceneObjectPart(ParentID); 531 SceneObjectPart part = m_scene.GetSceneObjectPart(ParentID);
505 if (part != null) 532 if (part != null)
506 { 533 {
507 return ParentPosition + (m_pos * part.GetWorldRotation()); 534 return part.AbsolutePosition + (m_pos * part.GetWorldRotation());
508 } 535 }
509 else 536 else
510 { 537 {
@@ -529,8 +556,10 @@ namespace OpenSim.Region.Framework.Scenes
529 } 556 }
530 } 557 }
531 558
532 m_pos = value; 559// Changed this to update unconditionally to make npose work
533 ParentPosition = Vector3.Zero; 560// if (m_parentID == 0) // KF Do NOT update m_pos here if Av is sitting!
561 m_pos = value;
562 m_parentPosition = Vector3.Zero;
534 563
535// m_log.DebugFormat( 564// m_log.DebugFormat(
536// "[ENTITY BASE]: In {0} set AbsolutePosition of {1} to {2}", 565// "[ENTITY BASE]: In {0} set AbsolutePosition of {1} to {2}",
@@ -587,15 +616,39 @@ namespace OpenSim.Region.Framework.Scenes
587 } 616 }
588 } 617 }
589 618
619 public Quaternion OffsetRotation
620 {
621 get { return m_offsetRotation; }
622 set { m_offsetRotation = value; }
623 }
590 private Quaternion m_bodyRot = Quaternion.Identity; 624 private Quaternion m_bodyRot = Quaternion.Identity;
591 625
592 public Quaternion Rotation 626 public Quaternion Rotation
593 { 627 {
594 get { return m_bodyRot; } 628 get {
595 set 629 if (m_parentID != 0)
596 { 630 {
631 if (m_offsetRotation != null)
632 {
633 return m_offsetRotation;
634 }
635 else
636 {
637 return new Quaternion(0.0f, 0.0f, 0.0f, 1.0f);
638 }
639
640 }
641 else
642 {
643 return m_bodyRot;
644 }
645 }
646 set {
597 m_bodyRot = value; 647 m_bodyRot = value;
598// m_log.DebugFormat("[SCENE PRESENCE]: Body rot for {0} set to {1}", Name, m_bodyRot); 648 if (m_parentID != 0)
649 {
650 m_offsetRotation = new Quaternion(0.0f, 0.0f, 0.0f, 1.0f);
651 }
599 } 652 }
600 } 653 }
601 654
@@ -613,12 +666,15 @@ namespace OpenSim.Region.Framework.Scenes
613 set { m_isChildAgent = value; } 666 set { m_isChildAgent = value; }
614 } 667 }
615 668
669 private uint m_parentID;
670
671
616 public uint ParentID 672 public uint ParentID
617 { 673 {
618 get { return m_parentID; } 674 get { return m_parentID; }
619 set { m_parentID = value; } 675 set { m_parentID = value; }
620 } 676 }
621 private uint m_parentID; 677
622 678
623 public float Health 679 public float Health
624 { 680 {
@@ -751,6 +807,7 @@ namespace OpenSim.Region.Framework.Scenes
751 m_localId = m_scene.AllocateLocalId(); 807 m_localId = m_scene.AllocateLocalId();
752 808
753 UserAccount account = m_scene.UserAccountService.GetUserAccount(m_scene.RegionInfo.ScopeID, m_uuid); 809 UserAccount account = m_scene.UserAccountService.GetUserAccount(m_scene.RegionInfo.ScopeID, m_uuid);
810 m_userFlags = account.UserFlags;
754 811
755 if (account != null) 812 if (account != null)
756 UserLevel = account.UserLevel; 813 UserLevel = account.UserLevel;
@@ -769,10 +826,7 @@ namespace OpenSim.Region.Framework.Scenes
769 m_reprioritization_timer.AutoReset = false; 826 m_reprioritization_timer.AutoReset = false;
770 827
771 AdjustKnownSeeds(); 828 AdjustKnownSeeds();
772
773 // TODO: I think, this won't send anything, as we are still a child here...
774 Animator.TrySetMovementAnimation("STAND"); 829 Animator.TrySetMovementAnimation("STAND");
775
776 // we created a new ScenePresence (a new child agent) in a fresh region. 830 // we created a new ScenePresence (a new child agent) in a fresh region.
777 // Request info about all the (root) agents in this region 831 // Request info about all the (root) agents in this region
778 // Note: This won't send data *to* other clients in that region (children don't send) 832 // Note: This won't send data *to* other clients in that region (children don't send)
@@ -813,26 +867,30 @@ namespace OpenSim.Region.Framework.Scenes
813 Dir_Vectors[3] = -Vector3.UnitY; //RIGHT 867 Dir_Vectors[3] = -Vector3.UnitY; //RIGHT
814 Dir_Vectors[4] = Vector3.UnitZ; //UP 868 Dir_Vectors[4] = Vector3.UnitZ; //UP
815 Dir_Vectors[5] = -Vector3.UnitZ; //DOWN 869 Dir_Vectors[5] = -Vector3.UnitZ; //DOWN
816 Dir_Vectors[8] = new Vector3(0f, 0f, -0.5f); //DOWN_Nudge 870 Dir_Vectors[6] = new Vector3(0.5f, 0f, 0f); //FORWARD_NUDGE
817 Dir_Vectors[6] = Vector3.UnitX*2; //FORWARD 871 Dir_Vectors[7] = new Vector3(-0.5f, 0f, 0f); //BACK_NUDGE
818 Dir_Vectors[7] = -Vector3.UnitX; //BACK 872 Dir_Vectors[8] = new Vector3(0f, 0.5f, 0f); //LEFT_NUDGE
873 Dir_Vectors[9] = new Vector3(0f, -0.5f, 0f); //RIGHT_NUDGE
874 Dir_Vectors[10] = new Vector3(0f, 0f, -0.5f); //DOWN_Nudge
819 } 875 }
820 876
821 private Vector3[] GetWalkDirectionVectors() 877 private Vector3[] GetWalkDirectionVectors()
822 { 878 {
823 Vector3[] vector = new Vector3[9]; 879 Vector3[] vector = new Vector3[11];
824 vector[0] = new Vector3(m_CameraUpAxis.Z, 0f, -CameraAtAxis.Z); //FORWARD 880 vector[0] = new Vector3(m_CameraUpAxis.Z, 0f, -m_CameraAtAxis.Z); //FORWARD
825 vector[1] = new Vector3(-m_CameraUpAxis.Z, 0f, CameraAtAxis.Z); //BACK 881 vector[1] = new Vector3(-m_CameraUpAxis.Z, 0f, m_CameraAtAxis.Z); //BACK
826 vector[2] = Vector3.UnitY; //LEFT 882 vector[2] = Vector3.UnitY; //LEFT
827 vector[3] = -Vector3.UnitY; //RIGHT 883 vector[3] = -Vector3.UnitY; //RIGHT
828 vector[4] = new Vector3(CameraAtAxis.Z, 0f, m_CameraUpAxis.Z); //UP 884 vector[4] = new Vector3(m_CameraAtAxis.Z, 0f, m_CameraUpAxis.Z); //UP
829 vector[5] = new Vector3(-CameraAtAxis.Z, 0f, -m_CameraUpAxis.Z); //DOWN 885 vector[5] = new Vector3(-m_CameraAtAxis.Z, 0f, -m_CameraUpAxis.Z); //DOWN
830 vector[8] = new Vector3(-CameraAtAxis.Z, 0f, -m_CameraUpAxis.Z); //DOWN_Nudge 886 vector[6] = new Vector3(m_CameraUpAxis.Z, 0f, -m_CameraAtAxis.Z); //FORWARD_NUDGE
831 vector[6] = (new Vector3(m_CameraUpAxis.Z, 0f, -CameraAtAxis.Z) * 2); //FORWARD Nudge 887 vector[7] = new Vector3(-m_CameraUpAxis.Z, 0f, m_CameraAtAxis.Z); //BACK_NUDGE
832 vector[7] = new Vector3(-m_CameraUpAxis.Z, 0f, CameraAtAxis.Z); //BACK Nudge 888 vector[8] = Vector3.UnitY; //LEFT_NUDGE
889 vector[9] = -Vector3.UnitY; //RIGHT_NUDGE
890 vector[10] = new Vector3(-m_CameraAtAxis.Z, 0f, -m_CameraUpAxis.Z); //DOWN_NUDGE
833 return vector; 891 return vector;
834 } 892 }
835 893
836 #endregion 894 #endregion
837 895
838 public uint GenerateClientFlags(UUID ObjectID) 896 public uint GenerateClientFlags(UUID ObjectID)
@@ -847,6 +905,8 @@ namespace OpenSim.Region.Framework.Scenes
847 /// </summary> 905 /// </summary>
848 public void SendPrimUpdates() 906 public void SendPrimUpdates()
849 { 907 {
908 m_sceneViewer.SendPrimUpdates();
909
850 SceneViewer.SendPrimUpdates(); 910 SceneViewer.SendPrimUpdates();
851 } 911 }
852 912
@@ -892,6 +952,62 @@ namespace OpenSim.Region.Framework.Scenes
892 pos.Y = crossedBorder.BorderLine.Z - 1; 952 pos.Y = crossedBorder.BorderLine.Z - 1;
893 } 953 }
894 954
955 ILandObject land = m_scene.LandChannel.GetLandObject(pos.X, pos.Y);
956 if (land != null)
957 {
958 // If we come in via login, landmark or map, we want to
959 // honor landing points. If we come in via Lure, we want
960 // to ignore them.
961 if ((m_teleportFlags & (TeleportFlags.ViaLogin | TeleportFlags.ViaRegionID)) == (TeleportFlags.ViaLogin | TeleportFlags.ViaRegionID) ||
962 (m_teleportFlags & TeleportFlags.ViaLandmark) != 0 ||
963 (m_teleportFlags & TeleportFlags.ViaLocation) != 0)
964 {
965 // Don't restrict gods, estate managers, or land owners to
966 // the TP point. This behaviour mimics agni.
967 if (land.LandData.LandingType == (byte)LandingType.LandingPoint &&
968 land.LandData.UserLocation != Vector3.Zero &&
969 GodLevel < 200 &&
970 ((land.LandData.OwnerID != m_uuid &&
971 (!m_scene.Permissions.IsGod(m_uuid)) &&
972 (!m_scene.RegionInfo.EstateSettings.IsEstateManager(m_uuid))) || (m_teleportFlags & TeleportFlags.ViaLocation) != 0))
973 {
974 pos = land.LandData.UserLocation;
975 }
976 }
977
978 land.SendLandUpdateToClient(ControllingClient);
979 }
980
981 if (pos.X < 0 || pos.Y < 0 || pos.Z < 0)
982 {
983 Vector3 emergencyPos = new Vector3(((int)Constants.RegionSize * 0.5f), ((int)Constants.RegionSize * 0.5f), 128);
984
985 if (pos.X < 0)
986 {
987 emergencyPos.X = (int)Constants.RegionSize + pos.X;
988 if (!(pos.Y < 0))
989 emergencyPos.Y = pos.Y;
990 if (!(pos.Z < 0))
991 emergencyPos.Z = pos.Z;
992 }
993 if (pos.Y < 0)
994 {
995 emergencyPos.Y = (int)Constants.RegionSize + pos.Y;
996 if (!(pos.X < 0))
997 emergencyPos.X = pos.X;
998 if (!(pos.Z < 0))
999 emergencyPos.Z = pos.Z;
1000 }
1001 if (pos.Z < 0)
1002 {
1003 emergencyPos.Z = 128;
1004 if (!(pos.Y < 0))
1005 emergencyPos.Y = pos.Y;
1006 if (!(pos.X < 0))
1007 emergencyPos.X = pos.X;
1008 }
1009 }
1010
895 if (pos.X < 0f || pos.Y < 0f || pos.Z < 0f) 1011 if (pos.X < 0f || pos.Y < 0f || pos.Z < 0f)
896 { 1012 {
897 m_log.WarnFormat( 1013 m_log.WarnFormat(
@@ -1024,16 +1140,21 @@ namespace OpenSim.Region.Framework.Scenes
1024 /// <summary> 1140 /// <summary>
1025 /// Removes physics plugin scene representation of this agent if it exists. 1141 /// Removes physics plugin scene representation of this agent if it exists.
1026 /// </summary> 1142 /// </summary>
1027 private void RemoveFromPhysicalScene() 1143 public void RemoveFromPhysicalScene()
1028 { 1144 {
1029 if (PhysicsActor != null) 1145 if (PhysicsActor != null)
1030 { 1146 {
1031 PhysicsActor.OnRequestTerseUpdate -= SendTerseUpdateToAllClients; 1147 try
1032 PhysicsActor.OnOutOfBounds -= OutOfBoundsCall; 1148 {
1033 m_scene.PhysicsScene.RemoveAvatar(PhysicsActor); 1149 m_physicsActor.OnRequestTerseUpdate -= SendTerseUpdateToAllClients;
1034 PhysicsActor.UnSubscribeEvents(); 1150 m_physicsActor.OnOutOfBounds -= OutOfBoundsCall;
1035 PhysicsActor.OnCollisionUpdate -= PhysicsCollisionUpdate; 1151 m_physicsActor.OnCollisionUpdate -= PhysicsCollisionUpdate;
1036 PhysicsActor = null; 1152 m_scene.PhysicsScene.RemoveAvatar(PhysicsActor);
1153 m_physicsActor.UnSubscribeEvents();
1154 PhysicsActor = null;
1155 }
1156 catch
1157 { }
1037 } 1158 }
1038 } 1159 }
1039 1160
@@ -1049,10 +1170,12 @@ namespace OpenSim.Region.Framework.Scenes
1049 1170
1050 RemoveFromPhysicalScene(); 1171 RemoveFromPhysicalScene();
1051 Velocity = Vector3.Zero; 1172 Velocity = Vector3.Zero;
1173 CheckLandingPoint(ref pos);
1052 AbsolutePosition = pos; 1174 AbsolutePosition = pos;
1053 AddToPhysicalScene(isFlying); 1175 AddToPhysicalScene(isFlying);
1054 1176
1055 SendTerseUpdateToAllClients(); 1177 SendTerseUpdateToAllClients();
1178
1056 } 1179 }
1057 1180
1058 public void TeleportWithMomentum(Vector3 pos) 1181 public void TeleportWithMomentum(Vector3 pos)
@@ -1062,6 +1185,7 @@ namespace OpenSim.Region.Framework.Scenes
1062 isFlying = PhysicsActor.Flying; 1185 isFlying = PhysicsActor.Flying;
1063 1186
1064 RemoveFromPhysicalScene(); 1187 RemoveFromPhysicalScene();
1188 CheckLandingPoint(ref pos);
1065 AbsolutePosition = pos; 1189 AbsolutePosition = pos;
1066 AddToPhysicalScene(isFlying); 1190 AddToPhysicalScene(isFlying);
1067 1191
@@ -1269,11 +1393,12 @@ namespace OpenSim.Region.Framework.Scenes
1269 /// <summary> 1393 /// <summary>
1270 /// This is the event handler for client movement. If a client is moving, this event is triggering. 1394 /// This is the event handler for client movement. If a client is moving, this event is triggering.
1271 /// </summary> 1395 /// </summary>
1396 /// <summary>
1397 /// This is the event handler for client movement. If a client is moving, this event is triggering.
1398 /// </summary>
1272 public void HandleAgentUpdate(IClientAPI remoteClient, AgentUpdateArgs agentData) 1399 public void HandleAgentUpdate(IClientAPI remoteClient, AgentUpdateArgs agentData)
1273 { 1400 {
1274// m_log.DebugFormat( 1401 // m_log.DebugFormat("[SCENE PRESENCE]: Received agent update from {0}", remoteClient.Name);
1275// "[SCENE PRESENCE]: In {0} received agent update from {1}",
1276// Scene.RegionInfo.RegionName, remoteClient.Name);
1277 1402
1278 //if (IsChildAgent) 1403 //if (IsChildAgent)
1279 //{ 1404 //{
@@ -1348,6 +1473,10 @@ namespace OpenSim.Region.Framework.Scenes
1348 1473
1349 #endregion Inputs 1474 #endregion Inputs
1350 1475
1476 // Make anims work for client side autopilot
1477 if ((flags & AgentManager.ControlFlags.AGENT_CONTROL_AT_POS) != 0)
1478 m_updateCount = UPDATE_COUNT;
1479
1351 if ((flags & AgentManager.ControlFlags.AGENT_CONTROL_STAND_UP) != 0) 1480 if ((flags & AgentManager.ControlFlags.AGENT_CONTROL_STAND_UP) != 0)
1352 { 1481 {
1353 StandUp(); 1482 StandUp();
@@ -1378,6 +1507,9 @@ namespace OpenSim.Region.Framework.Scenes
1378 1507
1379 if ((flags & AgentManager.ControlFlags.AGENT_CONTROL_SIT_ON_GROUND) != 0) 1508 if ((flags & AgentManager.ControlFlags.AGENT_CONTROL_SIT_ON_GROUND) != 0)
1380 { 1509 {
1510 m_updateCount = 0; // Kill animation update burst so that the SIT_G.. will stick.
1511 Animator.TrySetMovementAnimation("SIT_GROUND_CONSTRAINED");
1512
1381 // TODO: This doesn't prevent the user from walking yet. 1513 // TODO: This doesn't prevent the user from walking yet.
1382 // Setting parent ID would fix this, if we knew what value 1514 // Setting parent ID would fix this, if we knew what value
1383 // to use. Or we could add a m_isSitting variable. 1515 // to use. Or we could add a m_isSitting variable.
@@ -1467,7 +1599,7 @@ namespace OpenSim.Region.Framework.Scenes
1467 1599
1468 if ((MovementFlag & (byte)(uint)DCF) == 0) 1600 if ((MovementFlag & (byte)(uint)DCF) == 0)
1469 { 1601 {
1470 if (DCF == Dir_ControlFlags.DIR_CONTROL_FLAG_FORWARD_NUDGE || DCF == Dir_ControlFlags.DIR_CONTROL_FLAG_BACKWARD_NUDGE) 1602 if (DCF == Dir_ControlFlags.DIR_CONTROL_FLAG_FORWARD_NUDGE || DCF == Dir_ControlFlags.DIR_CONTROL_FLAG_BACK_NUDGE)
1471 { 1603 {
1472 MovementFlag |= (byte)nudgehack; 1604 MovementFlag |= (byte)nudgehack;
1473 } 1605 }
@@ -1479,13 +1611,13 @@ namespace OpenSim.Region.Framework.Scenes
1479 } 1611 }
1480 else 1612 else
1481 { 1613 {
1482 if ((MovementFlag & (byte)(uint)DCF) != 0 || 1614 if ((m_movementflag & (byte)(uint)DCF) != 0 ||
1483 ((DCF == Dir_ControlFlags.DIR_CONTROL_FLAG_FORWARD_NUDGE || DCF == Dir_ControlFlags.DIR_CONTROL_FLAG_BACKWARD_NUDGE) 1615 ((DCF == Dir_ControlFlags.DIR_CONTROL_FLAG_FORWARD_NUDGE || DCF == Dir_ControlFlags.DIR_CONTROL_FLAG_BACK_NUDGE)
1484 && ((MovementFlag & (byte)nudgehack) == nudgehack)) 1616 && ((m_movementflag & (byte)nudgehack) == nudgehack))
1485 ) // This or is for Nudge forward 1617 ) // This or is for Nudge forward
1486 { 1618 {
1487// m_log.DebugFormat("[SCENE PRESENCE]: Updating MovementFlag for {0} with lack of {1}", Name, DCF); 1619 // m_log.DebugFormat("[SCENE PRESENCE]: Updating m_movementflag for {0} with lack of {1}", Name, DCF);
1488 MovementFlag -= ((byte)(uint)DCF); 1620 m_movementflag -= ((byte)(uint)DCF);
1489 update_movementflag = true; 1621 update_movementflag = true;
1490 1622
1491 /* 1623 /*
@@ -1546,21 +1678,21 @@ namespace OpenSim.Region.Framework.Scenes
1546 // which occurs later in the main scene loop 1678 // which occurs later in the main scene loop
1547 if (update_movementflag || (update_rotation && DCFlagKeyPressed)) 1679 if (update_movementflag || (update_rotation && DCFlagKeyPressed))
1548 { 1680 {
1549// m_log.DebugFormat( 1681 // m_log.DebugFormat(
1550// "[SCENE PRESENCE]: In {0} adding velocity of {1} to {2}, umf = {3}, ur = {4}", 1682 // "[SCENE PRESENCE]: In {0} adding velocity of {1} to {2}, umf = {3}, ur = {4}",
1551// m_scene.RegionInfo.RegionName, agent_control_v3, Name, update_movementflag, update_rotation); 1683 // m_scene.RegionInfo.RegionName, agent_control_v3, Name, update_movementflag, update_rotation);
1552 1684
1553 AddNewMovement(agent_control_v3); 1685 AddNewMovement(agent_control_v3);
1554 } 1686 }
1555// else 1687 // else
1556// { 1688 // {
1557// if (!update_movementflag) 1689 // if (!update_movementflag)
1558// { 1690 // {
1559// m_log.DebugFormat( 1691 // m_log.DebugFormat(
1560// "[SCENE PRESENCE]: In {0} ignoring requested update of {1} for {2} as update_movementflag = false", 1692 // "[SCENE PRESENCE]: In {0} ignoring requested update of {1} for {2} as update_movementflag = false",
1561// m_scene.RegionInfo.RegionName, agent_control_v3, Name); 1693 // m_scene.RegionInfo.RegionName, agent_control_v3, Name);
1562// } 1694 // }
1563// } 1695 // }
1564 1696
1565 if (update_movementflag && ParentID == 0) 1697 if (update_movementflag && ParentID == 0)
1566 Animator.UpdateMovementAnimations(); 1698 Animator.UpdateMovementAnimations();
@@ -1579,20 +1711,20 @@ namespace OpenSim.Region.Framework.Scenes
1579 /// <returns>True if movement has been updated in some way. False otherwise.</returns> 1711 /// <returns>True if movement has been updated in some way. False otherwise.</returns>
1580 public bool HandleMoveToTargetUpdate(ref Vector3 agent_control_v3) 1712 public bool HandleMoveToTargetUpdate(ref Vector3 agent_control_v3)
1581 { 1713 {
1582// m_log.DebugFormat("[SCENE PRESENCE]: Called HandleMoveToTargetUpdate() for {0}", Name); 1714 // m_log.DebugFormat("[SCENE PRESENCE]: Called HandleMoveToTargetUpdate() for {0}", Name);
1583 1715
1584 bool updated = false; 1716 bool updated = false;
1585 1717
1586// m_log.DebugFormat( 1718 // m_log.DebugFormat(
1587// "[SCENE PRESENCE]: bAllowUpdateMoveToPosition {0}, m_moveToPositionInProgress {1}, m_autopilotMoving {2}", 1719 // "[SCENE PRESENCE]: bAllowUpdateMoveToPosition {0}, m_moveToPositionInProgress {1}, m_autopilotMoving {2}",
1588// allowUpdate, m_moveToPositionInProgress, m_autopilotMoving); 1720 // allowUpdate, m_moveToPositionInProgress, m_autopilotMoving);
1589 1721
1590 if (!m_autopilotMoving) 1722 if (!m_autopilotMoving)
1591 { 1723 {
1592 double distanceToTarget = Util.GetDistanceTo(AbsolutePosition, MoveToPositionTarget); 1724 double distanceToTarget = Util.GetDistanceTo(AbsolutePosition, MoveToPositionTarget);
1593// m_log.DebugFormat( 1725 // m_log.DebugFormat(
1594// "[SCENE PRESENCE]: Abs pos of {0} is {1}, target {2}, distance {3}", 1726 // "[SCENE PRESENCE]: Abs pos of {0} is {1}, target {2}, distance {3}",
1595// Name, AbsolutePosition, MoveToPositionTarget, distanceToTarget); 1727 // Name, AbsolutePosition, MoveToPositionTarget, distanceToTarget);
1596 1728
1597 // Check the error term of the current position in relation to the target position 1729 // Check the error term of the current position in relation to the target position
1598 if (distanceToTarget <= 1) 1730 if (distanceToTarget <= 1)
@@ -1615,7 +1747,7 @@ namespace OpenSim.Region.Framework.Scenes
1615 (MoveToPositionTarget - AbsolutePosition) // vector from cur. pos to target in global coords 1747 (MoveToPositionTarget - AbsolutePosition) // vector from cur. pos to target in global coords
1616 * Matrix4.CreateFromQuaternion(Quaternion.Inverse(Rotation)); // change to avatar coords 1748 * Matrix4.CreateFromQuaternion(Quaternion.Inverse(Rotation)); // change to avatar coords
1617 // Ignore z component of vector 1749 // Ignore z component of vector
1618// Vector3 LocalVectorToTarget2D = new Vector3((float)(LocalVectorToTarget3D.X), (float)(LocalVectorToTarget3D.Y), 0f); 1750 // Vector3 LocalVectorToTarget2D = new Vector3((float)(LocalVectorToTarget3D.X), (float)(LocalVectorToTarget3D.Y), 0f);
1619 LocalVectorToTarget3D.Normalize(); 1751 LocalVectorToTarget3D.Normalize();
1620 1752
1621 // update avatar movement flags. the avatar coordinate system is as follows: 1753 // update avatar movement flags. the avatar coordinate system is as follows:
@@ -1681,9 +1813,9 @@ namespace OpenSim.Region.Framework.Scenes
1681 updated = true; 1813 updated = true;
1682 } 1814 }
1683 1815
1684// m_log.DebugFormat( 1816 // m_log.DebugFormat(
1685// "[SCENE PRESENCE]: HandleMoveToTargetUpdate adding {0} to move vector {1} for {2}", 1817 // "[SCENE PRESENCE]: HandleMoveToTargetUpdate adding {0} to move vector {1} for {2}",
1686// LocalVectorToTarget3D, agent_control_v3, Name); 1818 // LocalVectorToTarget3D, agent_control_v3, Name);
1687 1819
1688 agent_control_v3 += LocalVectorToTarget3D; 1820 agent_control_v3 += LocalVectorToTarget3D;
1689 } 1821 }
@@ -1712,9 +1844,12 @@ namespace OpenSim.Region.Framework.Scenes
1712 /// </param> 1844 /// </param>
1713 public void MoveToTarget(Vector3 pos, bool noFly, bool landAtTarget) 1845 public void MoveToTarget(Vector3 pos, bool noFly, bool landAtTarget)
1714 { 1846 {
1715 m_log.DebugFormat( 1847 if (SitGround)
1716 "[SCENE PRESENCE]: Avatar {0} received request to move to position {1} in {2}", 1848 StandUp();
1717 Name, pos, m_scene.RegionInfo.RegionName); 1849
1850// m_log.DebugFormat(
1851// "[SCENE PRESENCE]: Avatar {0} received request to move to position {1} in {2}",
1852// Name, pos, m_scene.RegionInfo.RegionName);
1718 1853
1719 if (pos.X < 0 || pos.X >= Constants.RegionSize 1854 if (pos.X < 0 || pos.X >= Constants.RegionSize
1720 || pos.Y < 0 || pos.Y >= Constants.RegionSize 1855 || pos.Y < 0 || pos.Y >= Constants.RegionSize
@@ -1740,9 +1875,9 @@ namespace OpenSim.Region.Framework.Scenes
1740 if (pos.Z - terrainHeight < 0.2) 1875 if (pos.Z - terrainHeight < 0.2)
1741 pos.Z = terrainHeight; 1876 pos.Z = terrainHeight;
1742 1877
1743 m_log.DebugFormat( 1878// m_log.DebugFormat(
1744 "[SCENE PRESENCE]: Avatar {0} set move to target {1} (terrain height {2}) in {3}", 1879// "[SCENE PRESENCE]: Avatar {0} set move to target {1} (terrain height {2}) in {3}",
1745 Name, pos, terrainHeight, m_scene.RegionInfo.RegionName); 1880// Name, pos, terrainHeight, m_scene.RegionInfo.RegionName);
1746 1881
1747 if (noFly) 1882 if (noFly)
1748 PhysicsActor.Flying = false; 1883 PhysicsActor.Flying = false;
@@ -1778,7 +1913,7 @@ namespace OpenSim.Region.Framework.Scenes
1778 /// </summary> 1913 /// </summary>
1779 public void ResetMoveToTarget() 1914 public void ResetMoveToTarget()
1780 { 1915 {
1781 m_log.DebugFormat("[SCENE PRESENCE]: Resetting move to target for {0}", Name); 1916// m_log.DebugFormat("[SCENE PRESENCE]: Resetting move to target for {0}", Name);
1782 1917
1783 MovingToTarget = false; 1918 MovingToTarget = false;
1784 MoveToPositionTarget = Vector3.Zero; 1919 MoveToPositionTarget = Vector3.Zero;
@@ -1804,7 +1939,7 @@ namespace OpenSim.Region.Framework.Scenes
1804 Velocity = Vector3.Zero; 1939 Velocity = Vector3.Zero;
1805 SendAvatarDataToAllAgents(); 1940 SendAvatarDataToAllAgents();
1806 1941
1807 //HandleAgentSit(ControllingClient, m_requestedSitTargetUUID); 1942 HandleAgentSit(ControllingClient, m_requestedSitTargetUUID); //KF ??
1808 } 1943 }
1809 //ControllingClient.SendSitResponse(m_requestedSitTargetID, m_requestedSitOffset, Quaternion.Identity, false, Vector3.Zero, Vector3.Zero, false); 1944 //ControllingClient.SendSitResponse(m_requestedSitTargetID, m_requestedSitOffset, Quaternion.Identity, false, Vector3.Zero, Vector3.Zero, false);
1810 m_requestedSitTargetUUID = UUID.Zero; 1945 m_requestedSitTargetUUID = UUID.Zero;
@@ -1841,24 +1976,22 @@ namespace OpenSim.Region.Framework.Scenes
1841 1976
1842 if (ParentID != 0) 1977 if (ParentID != 0)
1843 { 1978 {
1844 m_log.Debug("StandupCode Executed"); 1979 SceneObjectPart part = m_scene.GetSceneObjectPart(m_requestedSitTargetID);
1845 SceneObjectPart part = m_scene.GetSceneObjectPart(ParentID);
1846 if (part != null) 1980 if (part != null)
1847 { 1981 {
1982 part.TaskInventory.LockItemsForRead(true);
1848 TaskInventoryDictionary taskIDict = part.TaskInventory; 1983 TaskInventoryDictionary taskIDict = part.TaskInventory;
1849 if (taskIDict != null) 1984 if (taskIDict != null)
1850 { 1985 {
1851 lock (taskIDict) 1986 foreach (UUID taskID in taskIDict.Keys)
1852 { 1987 {
1853 foreach (UUID taskID in taskIDict.Keys) 1988 UnRegisterControlEventsToScript(LocalId, taskID);
1854 { 1989 taskIDict[taskID].PermsMask &= ~(
1855 UnRegisterControlEventsToScript(LocalId, taskID); 1990 2048 | //PERMISSION_CONTROL_CAMERA
1856 taskIDict[taskID].PermsMask &= ~( 1991 4); // PERMISSION_TAKE_CONTROLS
1857 2048 | //PERMISSION_CONTROL_CAMERA
1858 4); // PERMISSION_TAKE_CONTROLS
1859 }
1860 } 1992 }
1861 } 1993 }
1994 part.TaskInventory.LockItemsForRead(false);
1862 1995
1863 // Reset sit target. 1996 // Reset sit target.
1864 if (part.SitTargetAvatar == UUID) 1997 if (part.SitTargetAvatar == UUID)
@@ -1869,21 +2002,59 @@ namespace OpenSim.Region.Framework.Scenes
1869 ParentPosition = part.GetWorldPosition(); 2002 ParentPosition = part.GetWorldPosition();
1870 ControllingClient.SendClearFollowCamProperties(part.ParentUUID); 2003 ControllingClient.SendClearFollowCamProperties(part.ParentUUID);
1871 } 2004 }
1872 2005 // part.GetWorldRotation() is the rotation of the object being sat on
1873 if (PhysicsActor == null) 2006 // Rotation is the sittiing Av's rotation
2007
2008 Quaternion partRot;
2009// if (part.LinkNum == 1)
2010// { // Root prim of linkset
2011// partRot = part.ParentGroup.RootPart.RotationOffset;
2012// }
2013// else
2014// { // single or child prim
2015
2016// }
2017 if (part == null) //CW: Part may be gone. llDie() for example.
1874 { 2018 {
1875 AddToPhysicalScene(false); 2019 partRot = new Quaternion(0.0f, 0.0f, 0.0f, 1.0f);
2020 }
2021 else
2022 {
2023 partRot = part.GetWorldRotation();
1876 } 2024 }
1877 2025
1878 m_pos += ParentPosition + new Vector3(0.0f, 0.0f, 2.0f*m_sitAvatarHeight); 2026 Quaternion partIRot = Quaternion.Inverse(partRot);
1879 ParentPosition = Vector3.Zero;
1880 2027
1881 ParentID = 0; 2028 Quaternion avatarRot = Quaternion.Inverse(Quaternion.Inverse(Rotation) * partIRot); // world or. of the av
2029 Vector3 avStandUp = new Vector3(0.3f, 0f, 0f) * avatarRot; // 0.3M infront of av
2030
2031
2032 if (m_physicsActor == null)
2033 {
2034 AddToPhysicalScene(false);
2035 }
2036 //CW: If the part isn't null then we can set the current position
2037 if (part != null)
2038 {
2039 Vector3 avWorldStandUp = avStandUp + part.GetWorldPosition() + ((m_pos - part.OffsetPosition) * partRot); // + av sit offset!
2040 AbsolutePosition = avWorldStandUp; //KF: Fix stand up.
2041 part.IsOccupied = false;
2042 part.ParentGroup.DeleteAvatar(ControllingClient.AgentId);
2043 }
2044 else
2045 {
2046 //CW: Since the part doesn't exist, a coarse standup position isn't an issue
2047 AbsolutePosition = m_lastWorldPosition;
2048 }
2049
2050 m_parentPosition = Vector3.Zero;
2051 m_parentID = 0;
2052 m_offsetRotation = new Quaternion(0.0f, 0.0f, 0.0f, 1.0f);
1882 SendAvatarDataToAllAgents(); 2053 SendAvatarDataToAllAgents();
1883 m_requestedSitTargetID = 0; 2054 m_requestedSitTargetID = 0;
1884 } 2055 }
1885 2056
1886 Animator.TrySetMovementAnimation("STAND"); 2057 Animator.UpdateMovementAnimations();
1887 } 2058 }
1888 2059
1889 private SceneObjectPart FindNextAvailableSitTarget(UUID targetID) 2060 private SceneObjectPart FindNextAvailableSitTarget(UUID targetID)
@@ -1915,9 +2086,7 @@ namespace OpenSim.Region.Framework.Scenes
1915 UUID avOnTargetAlready = part.SitTargetAvatar; 2086 UUID avOnTargetAlready = part.SitTargetAvatar;
1916 2087
1917 bool SitTargetUnOccupied = (!(avOnTargetAlready != UUID.Zero)); 2088 bool SitTargetUnOccupied = (!(avOnTargetAlready != UUID.Zero));
1918 bool SitTargetisSet = 2089 bool SitTargetisSet = (Vector3.Zero != avSitOffSet); //NB Latest SL Spec shows Sit Rotation setting is ignored.
1919 (!(avSitOffSet.X == 0f && avSitOffSet.Y == 0f && avSitOffSet.Z == 0f && avSitOrientation.W == 1f &&
1920 avSitOrientation.X == 0f && avSitOrientation.Y == 0f && avSitOrientation.Z == 0f));
1921 2090
1922 if (SitTargetisSet && SitTargetUnOccupied) 2091 if (SitTargetisSet && SitTargetUnOccupied)
1923 { 2092 {
@@ -1933,87 +2102,168 @@ namespace OpenSim.Region.Framework.Scenes
1933 private void SendSitResponse(IClientAPI remoteClient, UUID targetID, Vector3 offset, Quaternion pSitOrientation) 2102 private void SendSitResponse(IClientAPI remoteClient, UUID targetID, Vector3 offset, Quaternion pSitOrientation)
1934 { 2103 {
1935 bool autopilot = true; 2104 bool autopilot = true;
2105 Vector3 autopilotTarget = new Vector3();
2106 Quaternion sitOrientation = Quaternion.Identity;
1936 Vector3 pos = new Vector3(); 2107 Vector3 pos = new Vector3();
1937 Quaternion sitOrientation = pSitOrientation;
1938 Vector3 cameraEyeOffset = Vector3.Zero; 2108 Vector3 cameraEyeOffset = Vector3.Zero;
1939 Vector3 cameraAtOffset = Vector3.Zero; 2109 Vector3 cameraAtOffset = Vector3.Zero;
1940 bool forceMouselook = false; 2110 bool forceMouselook = false;
1941 2111
1942 //SceneObjectPart part = m_scene.GetSceneObjectPart(targetID); 2112 //SceneObjectPart part = m_scene.GetSceneObjectPart(targetID);
1943 SceneObjectPart part = FindNextAvailableSitTarget(targetID); 2113 SceneObjectPart part = FindNextAvailableSitTarget(targetID);
1944 if (part != null) 2114 if (part == null) return;
2115
2116 // TODO: determine position to sit at based on scene geometry; don't trust offset from client
2117 // see http://wiki.secondlife.com/wiki/User:Andrew_Linden/Office_Hours/2007_11_06 for details on how LL does it
2118
2119 // part is the prim to sit on
2120 // offset is the world-ref vector distance from that prim center to the click-spot
2121 // UUID is the UUID of the Avatar doing the clicking
2122
2123 m_avInitialPos = AbsolutePosition; // saved to calculate unscripted sit rotation
2124
2125 // Is a sit target available?
2126 Vector3 avSitOffSet = part.SitTargetPosition;
2127 Quaternion avSitOrientation = part.SitTargetOrientation;
2128
2129 bool SitTargetisSet = (Vector3.Zero != avSitOffSet); //NB Latest SL Spec shows Sit Rotation setting is ignored.
2130 // Quaternion partIRot = Quaternion.Inverse(part.GetWorldRotation());
2131 Quaternion partRot;
2132// if (part.LinkNum == 1)
2133// { // Root prim of linkset
2134// partRot = part.ParentGroup.RootPart.RotationOffset;
2135// }
2136// else
2137// { // single or child prim
2138 partRot = part.GetWorldRotation();
2139// }
2140 Quaternion partIRot = Quaternion.Inverse(partRot);
2141//Console.WriteLine("SendSitResponse offset=" + offset + " Occup=" + part.IsOccupied + " TargSet=" + SitTargetisSet);
2142 // Sit analysis rewritten by KF 091125
2143 if (SitTargetisSet) // scipted sit
1945 { 2144 {
1946 // TODO: determine position to sit at based on scene geometry; don't trust offset from client 2145 if (!part.IsOccupied)
1947 // see http://wiki.secondlife.com/wiki/User:Andrew_Linden/Office_Hours/2007_11_06 for details on how LL does it 2146 {
1948 2147//Console.WriteLine("Scripted, unoccupied");
1949 // Is a sit target available? 2148 part.SitTargetAvatar = UUID; // set that Av will be on it
1950 Vector3 avSitOffSet = part.SitTargetPosition; 2149 offset = new Vector3(avSitOffSet.X, avSitOffSet.Y, avSitOffSet.Z); // change ofset to the scripted one
1951 Quaternion avSitOrientation = part.SitTargetOrientation; 2150
1952 UUID avOnTargetAlready = part.SitTargetAvatar; 2151 Quaternion nrot = avSitOrientation;
1953 2152 if (!part.IsRoot)
1954 bool SitTargetUnOccupied = (!(avOnTargetAlready != UUID.Zero));
1955 bool SitTargetisSet =
1956 (!(avSitOffSet.X == 0f && avSitOffSet.Y == 0f && avSitOffSet.Z == 0f &&
1957 (
1958 avSitOrientation.X == 0f && avSitOrientation.Y == 0f && avSitOrientation.Z == 0f && avSitOrientation.W == 1f // Valid Zero Rotation quaternion
1959 || avSitOrientation.X == 0f && avSitOrientation.Y == 0f && avSitOrientation.Z == 1f && avSitOrientation.W == 0f // W-Z Mapping was invalid at one point
1960 || avSitOrientation.X == 0f && avSitOrientation.Y == 0f && avSitOrientation.Z == 0f && avSitOrientation.W == 0f // Invalid Quaternion
1961 )
1962 ));
1963
1964// m_log.DebugFormat("[SCENE PRESENCE]: {0} {1}", SitTargetisSet, SitTargetUnOccupied);
1965
1966 if (SitTargetisSet && SitTargetUnOccupied)
1967 {
1968 part.SitTargetAvatar = UUID;
1969 offset = new Vector3(avSitOffSet.X, avSitOffSet.Y, avSitOffSet.Z);
1970 sitOrientation = avSitOrientation;
1971 autopilot = false;
1972 }
1973 part.ParentGroup.TriggerScriptChangedEvent(Changed.LINK);
1974
1975 pos = part.AbsolutePosition + offset;
1976 //if (Math.Abs(part.AbsolutePosition.Z - AbsolutePosition.Z) > 1)
1977 //{
1978 // offset = pos;
1979 //autopilot = false;
1980 //}
1981 if (PhysicsActor != null)
1982 {
1983 // If we're not using the client autopilot, we're immediately warping the avatar to the location
1984 // We can remove the physicsActor until they stand up.
1985 m_sitAvatarHeight = PhysicsActor.Size.Z;
1986
1987 if (autopilot)
1988 { 2153 {
1989 if (Util.GetDistanceTo(AbsolutePosition, pos) < 4.5) 2154 nrot = part.RotationOffset * avSitOrientation;
1990 {
1991 autopilot = false;
1992
1993 RemoveFromPhysicalScene();
1994 AbsolutePosition = pos + new Vector3(0.0f, 0.0f, m_sitAvatarHeight);
1995 }
1996 } 2155 }
1997 else 2156 sitOrientation = nrot; // Change rotatione to the scripted one
2157 OffsetRotation = nrot;
2158 autopilot = false; // Jump direct to scripted llSitPos()
2159 }
2160 else
2161 {
2162//Console.WriteLine("Scripted, occupied");
2163 return;
2164 }
2165 }
2166 else // Not Scripted
2167 {
2168 if ( (Math.Abs(offset.X) > 0.1f) || (Math.Abs(offset.Y) > 0.1f) ) // Changed 0.5M to 0.1M as they want to be able to sit close together
2169 {
2170 // large prim & offset, ignore if other Avs sitting
2171// offset.Z -= 0.05f;
2172 m_avUnscriptedSitPos = offset * partIRot; // (non-zero) sit where clicked
2173 autopilotTarget = part.AbsolutePosition + offset; // World location of clicked point
2174
2175//Console.WriteLine(" offset ={0}", offset);
2176//Console.WriteLine(" UnscriptedSitPos={0}", m_avUnscriptedSitPos);
2177//Console.WriteLine(" autopilotTarget={0}", autopilotTarget);
2178
2179 }
2180 else // small offset
2181 {
2182//Console.WriteLine("Small offset");
2183 if (!part.IsOccupied)
2184 {
2185 m_avUnscriptedSitPos = Vector3.Zero; // Zero = Sit on prim center
2186 autopilotTarget = part.AbsolutePosition;
2187//Console.WriteLine("UsSmall autopilotTarget={0}", autopilotTarget);
2188 }
2189 else return; // occupied small
2190 } // end large/small
2191 } // end Scripted/not
2192
2193 part.ParentGroup.TriggerScriptChangedEvent(Changed.LINK);
2194
2195 cameraAtOffset = part.GetCameraAtOffset();
2196 cameraEyeOffset = part.GetCameraEyeOffset();
2197 forceMouselook = part.GetForceMouselook();
2198 if(cameraAtOffset == Vector3.Zero) cameraAtOffset = new Vector3(0f, 0f, 0.1f); //
2199 if(cameraEyeOffset == Vector3.Zero) cameraEyeOffset = new Vector3(0f, 0f, 0.1f); //
2200
2201 if (m_physicsActor != null)
2202 {
2203 // If we're not using the client autopilot, we're immediately warping the avatar to the location
2204 // We can remove the physicsActor until they stand up.
2205 m_sitAvatarHeight = m_physicsActor.Size.Z;
2206 if (autopilot)
2207 { // its not a scripted sit
2208// if (Util.GetDistanceTo(AbsolutePosition, autopilotTarget) < 4.5)
2209 if( (Math.Abs(AbsolutePosition.X - autopilotTarget.X) < 256.0f) && (Math.Abs(AbsolutePosition.Y - autopilotTarget.Y) < 256.0f) )
1998 { 2210 {
2211 autopilot = false; // close enough
2212 m_lastWorldPosition = m_pos; /* CW - This give us a position to return the avatar to if the part is killed before standup.
2213 Not using the part's position because returning the AV to the last known standing
2214 position is likely to be more friendly, isn't it? */
1999 RemoveFromPhysicalScene(); 2215 RemoveFromPhysicalScene();
2000 } 2216 Velocity = Vector3.Zero;
2217 AbsolutePosition = autopilotTarget + new Vector3(0.0f, 0.0f, (m_sitAvatarHeight / 2.0f)); // Warp av to over sit target
2218 } // else the autopilot will get us close
2219 }
2220 else
2221 { // its a scripted sit
2222 m_lastWorldPosition = part.AbsolutePosition; /* CW - This give us a position to return the avatar to if the part is killed before standup.
2223 I *am* using the part's position this time because we have no real idea how far away
2224 the avatar is from the sit target. */
2225 RemoveFromPhysicalScene();
2226 Velocity = Vector3.Zero;
2001 } 2227 }
2002
2003 cameraAtOffset = part.GetCameraAtOffset();
2004 cameraEyeOffset = part.GetCameraEyeOffset();
2005 forceMouselook = part.GetForceMouselook();
2006 } 2228 }
2007 2229 else return; // physactor is null!
2008 ControllingClient.SendSitResponse(targetID, offset, sitOrientation, autopilot, cameraAtOffset, cameraEyeOffset, forceMouselook); 2230
2009 m_requestedSitTargetUUID = targetID; 2231 Vector3 offsetr; // = offset * partIRot;
2232 // KF: In a linkset, offsetr needs to be relative to the group root! 091208
2233 // offsetr = (part.OffsetPosition * Quaternion.Inverse(part.ParentGroup.RootPart.RotationOffset)) + (offset * partIRot);
2234 // if (part.LinkNum < 2) 091216 All this was necessary because of the GetWorldRotation error.
2235 // { // Single, or Root prim of linkset, target is ClickOffset * RootRot
2236 //offsetr = offset * partIRot;
2237//
2238 // }
2239 // else
2240 // { // Child prim, offset is (ChildOffset * RootRot) + (ClickOffset * ChildRot)
2241 // offsetr = //(part.OffsetPosition * Quaternion.Inverse(part.ParentGroup.RootPart.RotationOffset)) +
2242 // (offset * partRot);
2243 // }
2244
2245//Console.WriteLine(" ");
2246//Console.WriteLine("link number ={0}", part.LinkNum);
2247//Console.WriteLine("Prim offset ={0}", part.OffsetPosition );
2248//Console.WriteLine("Root Rotate ={0}", part.ParentGroup.RootPart.RotationOffset);
2249//Console.WriteLine("Click offst ={0}", offset);
2250//Console.WriteLine("Prim Rotate ={0}", part.GetWorldRotation());
2251//Console.WriteLine("offsetr ={0}", offsetr);
2252//Console.WriteLine("Camera At ={0}", cameraAtOffset);
2253//Console.WriteLine("Camera Eye ={0}", cameraEyeOffset);
2254
2255 //NOTE: SendSitResponse should be relative to the GROUP *NOT* THE PRIM if we're sitting on a child
2256 ControllingClient.SendSitResponse(part.ParentGroup.UUID, ((offset * part.RotationOffset) + part.OffsetPosition), sitOrientation, autopilot, cameraAtOffset, cameraEyeOffset, forceMouselook);
2257
2258 m_requestedSitTargetUUID = part.UUID; //KF: Correct autopilot target
2010 // This calls HandleAgentSit twice, once from here, and the client calls 2259 // This calls HandleAgentSit twice, once from here, and the client calls
2011 // HandleAgentSit itself after it gets to the location 2260 // HandleAgentSit itself after it gets to the location
2012 // It doesn't get to the location until we've moved them there though 2261 // It doesn't get to the location until we've moved them there though
2013 // which happens in HandleAgentSit :P 2262 // which happens in HandleAgentSit :P
2014 m_autopilotMoving = autopilot; 2263 m_autopilotMoving = autopilot;
2015 m_autoPilotTarget = pos; 2264 m_autoPilotTarget = autopilotTarget;
2016 m_sitAtAutoTarget = autopilot; 2265 m_sitAtAutoTarget = autopilot;
2266 m_initialSitTarget = autopilotTarget;
2017 if (!autopilot) 2267 if (!autopilot)
2018 HandleAgentSit(remoteClient, UUID); 2268 HandleAgentSit(remoteClient, UUID);
2019 } 2269 }
@@ -2279,45 +2529,127 @@ namespace OpenSim.Region.Framework.Scenes
2279 { 2529 {
2280 if (part.SitTargetAvatar == UUID) 2530 if (part.SitTargetAvatar == UUID)
2281 { 2531 {
2532//Console.WriteLine("Scripted Sit");
2533 // Scripted sit
2282 Vector3 sitTargetPos = part.SitTargetPosition; 2534 Vector3 sitTargetPos = part.SitTargetPosition;
2283 Quaternion sitTargetOrient = part.SitTargetOrientation; 2535 Quaternion sitTargetOrient = part.SitTargetOrientation;
2284
2285 //Quaternion vq = new Quaternion(sitTargetPos.X, sitTargetPos.Y+0.2f, sitTargetPos.Z+0.2f, 0);
2286 //Quaternion nq = new Quaternion(-sitTargetOrient.X, -sitTargetOrient.Y, -sitTargetOrient.Z, sitTargetOrient.w);
2287
2288 //Quaternion result = (sitTargetOrient * vq) * nq;
2289
2290 m_pos = new Vector3(sitTargetPos.X, sitTargetPos.Y, sitTargetPos.Z); 2536 m_pos = new Vector3(sitTargetPos.X, sitTargetPos.Y, sitTargetPos.Z);
2291 m_pos += SIT_TARGET_ADJUSTMENT; 2537 m_pos += SIT_TARGET_ADJUSTMENT;
2292 Rotation = sitTargetOrient; 2538 if (!part.IsRoot)
2293 //Rotation = sitTargetOrient; 2539 {
2294 ParentPosition = part.AbsolutePosition; 2540 m_pos *= part.RotationOffset;
2295 2541 }
2296 //SendTerseUpdateToAllClients(); 2542 m_bodyRot = sitTargetOrient;
2543 m_parentPosition = part.AbsolutePosition;
2544 part.IsOccupied = true;
2545 part.ParentGroup.AddAvatar(agentID);
2297 } 2546 }
2298 else 2547 else
2299 { 2548 {
2300 m_pos -= part.AbsolutePosition; 2549 // if m_avUnscriptedSitPos is zero then Av sits above center
2301 ParentPosition = part.AbsolutePosition; 2550 // Else Av sits at m_avUnscriptedSitPos
2302 } 2551
2552 // Non-scripted sit by Kitto Flora 21Nov09
2553 // Calculate angle of line from prim to Av
2554 Quaternion partIRot;
2555// if (part.LinkNum == 1)
2556// { // Root prim of linkset
2557// partIRot = Quaternion.Inverse(part.ParentGroup.RootPart.RotationOffset);
2558// }
2559// else
2560// { // single or child prim
2561 partIRot = Quaternion.Inverse(part.GetWorldRotation());
2562// }
2563 Vector3 sitTargetPos= part.AbsolutePosition + m_avUnscriptedSitPos;
2564 float y_diff = (m_avInitialPos.Y - sitTargetPos.Y);
2565 float x_diff = ( m_avInitialPos.X - sitTargetPos.X);
2566 if(Math.Abs(x_diff) < 0.001f) x_diff = 0.001f; // avoid div by 0
2567 if(Math.Abs(y_diff) < 0.001f) y_diff = 0.001f; // avoid pol flip at 0
2568 float sit_angle = (float)Math.Atan2( (double)y_diff, (double)x_diff);
2569 // NOTE: when sitting m_ pos and m_bodyRot are *relative* to the prim location/rotation, not 'World'.
2570 // Av sits at world euler <0,0, z>, translated by part rotation
2571 m_bodyRot = partIRot * Quaternion.CreateFromEulers(0f, 0f, sit_angle); // sit at 0,0,inv-click
2572
2573 m_parentPosition = part.AbsolutePosition;
2574 part.IsOccupied = true;
2575 part.ParentGroup.AddAvatar(agentID);
2576 m_pos = new Vector3(0f, 0f, 0.05f) + // corrections to get Sit Animation
2577 (new Vector3(0.0f, 0f, 0.61f) * partIRot) + // located on center
2578 (new Vector3(0.34f, 0f, 0.0f) * m_bodyRot) +
2579 m_avUnscriptedSitPos; // adds click offset, if any
2580 //Set up raytrace to find top surface of prim
2581 Vector3 size = part.Scale;
2582 float mag = 2.0f; // 0.1f + (float)Math.Sqrt((size.X * size.X) + (size.Y * size.Y) + (size.Z * size.Z));
2583 Vector3 start = part.AbsolutePosition + new Vector3(0f, 0f, mag);
2584 Vector3 down = new Vector3(0f, 0f, -1f);
2585//Console.WriteLine("st={0} do={1} ma={2}", start, down, mag);
2586 m_scene.PhysicsScene.RaycastWorld(
2587 start, // Vector3 position,
2588 down, // Vector3 direction,
2589 mag, // float length,
2590 SitAltitudeCallback); // retMethod
2591 } // end scripted/not
2303 } 2592 }
2304 else 2593 else // no Av
2305 { 2594 {
2306 return; 2595 return;
2307 } 2596 }
2308 } 2597 }
2309 ParentID = m_requestedSitTargetID; 2598 ParentID = m_requestedSitTargetID;
2310 2599
2600 //We want our offsets to reference the root prim, not the child we may have sat on
2601 if (!part.IsRoot)
2602 {
2603 m_parentID = part.ParentGroup.RootPart.LocalId;
2604 m_pos += part.OffsetPosition;
2605 }
2606 else
2607 {
2608 m_parentID = m_requestedSitTargetID;
2609 }
2610
2611 if (part.SitTargetAvatar != UUID)
2612 {
2613 m_offsetRotation = m_offsetRotation / part.RotationOffset;
2614 }
2311 Velocity = Vector3.Zero; 2615 Velocity = Vector3.Zero;
2312 RemoveFromPhysicalScene(); 2616 RemoveFromPhysicalScene();
2313
2314 Animator.TrySetMovementAnimation(sitAnimation); 2617 Animator.TrySetMovementAnimation(sitAnimation);
2315 SendAvatarDataToAllAgents(); 2618 SendAvatarDataToAllAgents();
2316 // This may seem stupid, but Our Full updates don't send avatar rotation :P
2317 // So we're also sending a terse update (which has avatar rotation)
2318 // [Update] We do now.
2319 //SendTerseUpdateToAllClients(); 2619 //SendTerseUpdateToAllClients();
2320 } 2620 }
2621
2622 public void SitAltitudeCallback(bool hitYN, Vector3 collisionPoint, uint localid, float distance, Vector3 normal)
2623 {
2624 // KF: 091202 There appears to be a bug in Prim Edit Size - the process sometimes make a prim that RayTrace no longer
2625 // sees. Take/re-rez, or sim restart corrects the condition. Result of bug is incorrect sit height.
2626 if(hitYN)
2627 {
2628 // m_pos = Av offset from prim center to make look like on center
2629 // m_parentPosition = Actual center pos of prim
2630 // collisionPoint = spot on prim where we want to sit
2631 // collisionPoint.Z = global sit surface height
2632 SceneObjectPart part = m_scene.GetSceneObjectPart(localid);
2633 Quaternion partIRot;
2634// if (part.LinkNum == 1)
2635/// { // Root prim of linkset
2636// partIRot = Quaternion.Inverse(part.ParentGroup.RootPart.RotationOffset);
2637// }
2638// else
2639// { // single or child prim
2640 partIRot = Quaternion.Inverse(part.GetWorldRotation());
2641// }
2642 if (m_initialSitTarget != null)
2643 {
2644 float offZ = collisionPoint.Z - m_initialSitTarget.Z;
2645 Vector3 offset = new Vector3(0.0f, 0.0f, offZ) * partIRot; // Altitude correction
2646 //Console.WriteLine("sitPoint={0}, offset={1}", sitPoint, offset);
2647 m_pos += offset;
2648 // ControllingClient.SendClearFollowCamProperties(part.UUID);
2649 }
2650
2651 }
2652 } // End SitAltitudeCallback KF.
2321 2653
2322 /// <summary> 2654 /// <summary>
2323 /// Event handler for the 'Always run' setting on the client 2655 /// Event handler for the 'Always run' setting on the client
@@ -2347,6 +2679,19 @@ namespace OpenSim.Region.Framework.Scenes
2347 Vector3 direc = vec * Rotation; 2679 Vector3 direc = vec * Rotation;
2348 direc.Normalize(); 2680 direc.Normalize();
2349 2681
2682 if (PhysicsActor.Flying != m_flyingOld) // add for fly velocity control
2683 {
2684 m_flyingOld = PhysicsActor.Flying; // add for fly velocity control
2685 if (!PhysicsActor.Flying)
2686 m_wasFlying = true; // add for fly velocity control
2687 }
2688
2689 if (PhysicsActor.IsColliding == true)
2690 m_wasFlying = false; // add for fly velocity control
2691
2692 if ((vec.Z == 0f) && !PhysicsActor.Flying)
2693 direc.Z = 0f; // Prevent camera WASD up.
2694
2350 direc *= 0.03f * 128f * SpeedModifier; 2695 direc *= 0.03f * 128f * SpeedModifier;
2351 2696
2352 if (PhysicsActor != null) 2697 if (PhysicsActor != null)
@@ -2365,6 +2710,10 @@ namespace OpenSim.Region.Framework.Scenes
2365 // m_log.Info("[AGENT]: Stop Flying"); 2710 // m_log.Info("[AGENT]: Stop Flying");
2366 //} 2711 //}
2367 } 2712 }
2713 if (Animator.m_falling && m_wasFlying) // if falling from flying, disable motion add
2714 {
2715 direc *= 0.0f;
2716 }
2368 else if (!PhysicsActor.Flying && PhysicsActor.IsColliding) 2717 else if (!PhysicsActor.Flying && PhysicsActor.IsColliding)
2369 { 2718 {
2370 if (direc.Z > 2.0f) 2719 if (direc.Z > 2.0f)
@@ -2425,6 +2774,9 @@ namespace OpenSim.Region.Framework.Scenes
2425 2774
2426 CheckForSignificantMovement(); // sends update to the modules. 2775 CheckForSignificantMovement(); // sends update to the modules.
2427 } 2776 }
2777
2778 //Sending prim updates AFTER the avatar terse updates are sent
2779 SendPrimUpdates();
2428 } 2780 }
2429 2781
2430 #endregion 2782 #endregion
@@ -3144,6 +3496,7 @@ namespace OpenSim.Region.Framework.Scenes
3144 m_callbackURI = cAgent.CallbackURI; 3496 m_callbackURI = cAgent.CallbackURI;
3145 3497
3146 m_pos = cAgent.Position; 3498 m_pos = cAgent.Position;
3499
3147 m_velocity = cAgent.Velocity; 3500 m_velocity = cAgent.Velocity;
3148 CameraPosition = cAgent.Center; 3501 CameraPosition = cAgent.Center;
3149 CameraAtAxis = cAgent.AtAxis; 3502 CameraAtAxis = cAgent.AtAxis;
@@ -3290,14 +3643,28 @@ namespace OpenSim.Region.Framework.Scenes
3290 //if ((Math.Abs(Velocity.X) > 0.1e-9f) || (Math.Abs(Velocity.Y) > 0.1e-9f)) 3643 //if ((Math.Abs(Velocity.X) > 0.1e-9f) || (Math.Abs(Velocity.Y) > 0.1e-9f))
3291 // The Physics Scene will send updates every 500 ms grep: PhysicsActor.SubscribeEvents( 3644 // The Physics Scene will send updates every 500 ms grep: PhysicsActor.SubscribeEvents(
3292 // as of this comment the interval is set in AddToPhysicalScene 3645 // as of this comment the interval is set in AddToPhysicalScene
3293 if (Animator != null) 3646 if (Animator!=null)
3294 Animator.UpdateMovementAnimations(); 3647 {
3648 if (m_updateCount > 0) //KF: DO NOT call UpdateMovementAnimations outside of the m_updateCount wrapper,
3649 { // else its will lock out other animation changes, like ground sit.
3650 Animator.UpdateMovementAnimations();
3651 m_updateCount--;
3652 }
3653 }
3295 3654
3296 CollisionEventUpdate collisionData = (CollisionEventUpdate)e; 3655 CollisionEventUpdate collisionData = (CollisionEventUpdate)e;
3297 Dictionary<uint, ContactPoint> coldata = collisionData.m_objCollisionList; 3656 Dictionary<uint, ContactPoint> coldata = collisionData.m_objCollisionList;
3298 3657
3299 CollisionPlane = Vector4.UnitW; 3658 CollisionPlane = Vector4.UnitW;
3300 3659
3660 // No collisions at all means we may be flying. Update always
3661 // to make falling work
3662 if (m_lastColCount != coldata.Count || coldata.Count == 0)
3663 {
3664 m_updateCount = UPDATE_COUNT;
3665 m_lastColCount = coldata.Count;
3666 }
3667
3301 if (coldata.Count != 0 && Animator != null) 3668 if (coldata.Count != 0 && Animator != null)
3302 { 3669 {
3303 switch (Animator.CurrentMovementAnimation) 3670 switch (Animator.CurrentMovementAnimation)
@@ -3327,6 +3694,148 @@ namespace OpenSim.Region.Framework.Scenes
3327 } 3694 }
3328 } 3695 }
3329 3696
3697 List<uint> thisHitColliders = new List<uint>();
3698 List<uint> endedColliders = new List<uint>();
3699 List<uint> startedColliders = new List<uint>();
3700
3701 foreach (uint localid in coldata.Keys)
3702 {
3703 thisHitColliders.Add(localid);
3704 if (!m_lastColliders.Contains(localid))
3705 {
3706 startedColliders.Add(localid);
3707 }
3708 //m_log.Debug("[SCENE PRESENCE]: Collided with:" + localid.ToString() + " at depth of: " + collissionswith[localid].ToString());
3709 }
3710
3711 // calculate things that ended colliding
3712 foreach (uint localID in m_lastColliders)
3713 {
3714 if (!thisHitColliders.Contains(localID))
3715 {
3716 endedColliders.Add(localID);
3717 }
3718 }
3719 //add the items that started colliding this time to the last colliders list.
3720 foreach (uint localID in startedColliders)
3721 {
3722 m_lastColliders.Add(localID);
3723 }
3724 // remove things that ended colliding from the last colliders list
3725 foreach (uint localID in endedColliders)
3726 {
3727 m_lastColliders.Remove(localID);
3728 }
3729
3730 // do event notification
3731 if (startedColliders.Count > 0)
3732 {
3733 ColliderArgs StartCollidingMessage = new ColliderArgs();
3734 List<DetectedObject> colliding = new List<DetectedObject>();
3735 foreach (uint localId in startedColliders)
3736 {
3737 if (localId == 0)
3738 continue;
3739
3740 SceneObjectPart obj = Scene.GetSceneObjectPart(localId);
3741 string data = "";
3742 if (obj != null)
3743 {
3744 DetectedObject detobj = new DetectedObject();
3745 detobj.keyUUID = obj.UUID;
3746 detobj.nameStr = obj.Name;
3747 detobj.ownerUUID = obj.OwnerID;
3748 detobj.posVector = obj.AbsolutePosition;
3749 detobj.rotQuat = obj.GetWorldRotation();
3750 detobj.velVector = obj.Velocity;
3751 detobj.colliderType = 0;
3752 detobj.groupUUID = obj.GroupID;
3753 colliding.Add(detobj);
3754 }
3755 }
3756
3757 if (colliding.Count > 0)
3758 {
3759 StartCollidingMessage.Colliders = colliding;
3760
3761 foreach (SceneObjectGroup att in GetAttachments())
3762 Scene.EventManager.TriggerScriptCollidingStart(att.LocalId, StartCollidingMessage);
3763 }
3764 }
3765
3766 if (endedColliders.Count > 0)
3767 {
3768 ColliderArgs EndCollidingMessage = new ColliderArgs();
3769 List<DetectedObject> colliding = new List<DetectedObject>();
3770 foreach (uint localId in endedColliders)
3771 {
3772 if (localId == 0)
3773 continue;
3774
3775 SceneObjectPart obj = Scene.GetSceneObjectPart(localId);
3776 string data = "";
3777 if (obj != null)
3778 {
3779 DetectedObject detobj = new DetectedObject();
3780 detobj.keyUUID = obj.UUID;
3781 detobj.nameStr = obj.Name;
3782 detobj.ownerUUID = obj.OwnerID;
3783 detobj.posVector = obj.AbsolutePosition;
3784 detobj.rotQuat = obj.GetWorldRotation();
3785 detobj.velVector = obj.Velocity;
3786 detobj.colliderType = 0;
3787 detobj.groupUUID = obj.GroupID;
3788 colliding.Add(detobj);
3789 }
3790 }
3791
3792 if (colliding.Count > 0)
3793 {
3794 EndCollidingMessage.Colliders = colliding;
3795
3796 foreach (SceneObjectGroup att in GetAttachments())
3797 Scene.EventManager.TriggerScriptCollidingEnd(att.LocalId, EndCollidingMessage);
3798 }
3799 }
3800
3801 if (thisHitColliders.Count > 0)
3802 {
3803 ColliderArgs CollidingMessage = new ColliderArgs();
3804 List<DetectedObject> colliding = new List<DetectedObject>();
3805 foreach (uint localId in thisHitColliders)
3806 {
3807 if (localId == 0)
3808 continue;
3809
3810 SceneObjectPart obj = Scene.GetSceneObjectPart(localId);
3811 string data = "";
3812 if (obj != null)
3813 {
3814 DetectedObject detobj = new DetectedObject();
3815 detobj.keyUUID = obj.UUID;
3816 detobj.nameStr = obj.Name;
3817 detobj.ownerUUID = obj.OwnerID;
3818 detobj.posVector = obj.AbsolutePosition;
3819 detobj.rotQuat = obj.GetWorldRotation();
3820 detobj.velVector = obj.Velocity;
3821 detobj.colliderType = 0;
3822 detobj.groupUUID = obj.GroupID;
3823 colliding.Add(detobj);
3824 }
3825 }
3826
3827 if (colliding.Count > 0)
3828 {
3829 CollidingMessage.Colliders = colliding;
3830
3831 lock (m_attachments)
3832 {
3833 foreach (SceneObjectGroup att in m_attachments)
3834 Scene.EventManager.TriggerScriptColliding(att.LocalId, CollidingMessage);
3835 }
3836 }
3837 }
3838
3330 if (Invulnerable) 3839 if (Invulnerable)
3331 return; 3840 return;
3332 3841
@@ -3398,6 +3907,10 @@ namespace OpenSim.Region.Framework.Scenes
3398 { 3907 {
3399 lock (m_attachments) 3908 lock (m_attachments)
3400 { 3909 {
3910 // This may be true when the attachment comes back
3911 // from serialization after login. Clear it.
3912 gobj.IsDeleted = false;
3913
3401 m_attachments.Add(gobj); 3914 m_attachments.Add(gobj);
3402 } 3915 }
3403 } 3916 }
@@ -3761,5 +4274,39 @@ namespace OpenSim.Region.Framework.Scenes
3761 m_reprioritization_called = false; 4274 m_reprioritization_called = false;
3762 } 4275 }
3763 } 4276 }
4277
4278 private Vector3 Quat2Euler(Quaternion rot){
4279 float x = Utils.RAD_TO_DEG * (float)Math.Atan2((double)((2.0f * rot.X * rot.W) - (2.0f * rot.Y * rot.Z)) ,
4280 (double)(1 - (2.0f * rot.X * rot.X) - (2.0f * rot.Z * rot.Z)));
4281 float y = Utils.RAD_TO_DEG * (float)Math.Asin ((double)((2.0f * rot.X * rot.Y) + (2.0f * rot.Z * rot.W)));
4282 float z = Utils.RAD_TO_DEG * (float)Math.Atan2(((double)(2.0f * rot.Y * rot.W) - (2.0f * rot.X * rot.Z)) ,
4283 (double)(1 - (2.0f * rot.Y * rot.Y) - (2.0f * rot.Z * rot.Z)));
4284 return(new Vector3(x,y,z));
4285 }
4286
4287 private void CheckLandingPoint(ref Vector3 pos)
4288 {
4289 // Never constrain lures
4290 if ((TeleportFlags & TeleportFlags.ViaLure) != 0)
4291 return;
4292
4293 if (m_scene.RegionInfo.EstateSettings.AllowDirectTeleport)
4294 return;
4295
4296 ILandObject land = m_scene.LandChannel.GetLandObject(pos.X, pos.Y);
4297
4298 if (land.LandData.LandingType == (byte)LandingType.LandingPoint &&
4299 land.LandData.UserLocation != Vector3.Zero &&
4300 land.LandData.OwnerID != m_uuid &&
4301 (!m_scene.Permissions.IsGod(m_uuid)) &&
4302 (!m_scene.RegionInfo.EstateSettings.IsEstateManager(m_uuid)))
4303 {
4304 float curr = Vector3.Distance(AbsolutePosition, pos);
4305 if (Vector3.Distance(land.LandData.UserLocation, pos) < curr)
4306 pos = land.LandData.UserLocation;
4307 else
4308 ControllingClient.SendAlertMessage("Can't teleport closer to destination");
4309 }
4310 }
3764 } 4311 }
3765} 4312}
diff --git a/OpenSim/Region/Framework/Scenes/SceneViewer.cs b/OpenSim/Region/Framework/Scenes/SceneViewer.cs
index d6bb81c..2c3084c 100644
--- a/OpenSim/Region/Framework/Scenes/SceneViewer.cs
+++ b/OpenSim/Region/Framework/Scenes/SceneViewer.cs
@@ -123,7 +123,7 @@ namespace OpenSim.Region.Framework.Scenes
123 g.ScheduleFullUpdateToAvatar(m_presence); 123 g.ScheduleFullUpdateToAvatar(m_presence);
124 } 124 }
125 125
126 while (m_partsUpdateQueue.Count > 0) 126 while (m_partsUpdateQueue != null && m_partsUpdateQueue.Count != null && m_partsUpdateQueue.Count > 0)
127 { 127 {
128 SceneObjectPart part = m_partsUpdateQueue.Dequeue(); 128 SceneObjectPart part = m_partsUpdateQueue.Dequeue();
129 129
diff --git a/OpenSim/Region/Framework/Scenes/Serialization/SceneObjectSerializer.cs b/OpenSim/Region/Framework/Scenes/Serialization/SceneObjectSerializer.cs
index e06a222..11dad6c 100644
--- a/OpenSim/Region/Framework/Scenes/Serialization/SceneObjectSerializer.cs
+++ b/OpenSim/Region/Framework/Scenes/Serialization/SceneObjectSerializer.cs
@@ -346,6 +346,8 @@ namespace OpenSim.Region.Framework.Scenes.Serialization
346 m_SOPXmlProcessors.Add("PayPrice2", ProcessPayPrice2); 346 m_SOPXmlProcessors.Add("PayPrice2", ProcessPayPrice2);
347 m_SOPXmlProcessors.Add("PayPrice3", ProcessPayPrice3); 347 m_SOPXmlProcessors.Add("PayPrice3", ProcessPayPrice3);
348 m_SOPXmlProcessors.Add("PayPrice4", ProcessPayPrice4); 348 m_SOPXmlProcessors.Add("PayPrice4", ProcessPayPrice4);
349
350 m_SOPXmlProcessors.Add("Buoyancy", ProcessBuoyancy);
349 #endregion 351 #endregion
350 352
351 #region TaskInventoryXmlProcessors initialization 353 #region TaskInventoryXmlProcessors initialization
@@ -735,6 +737,11 @@ namespace OpenSim.Region.Framework.Scenes.Serialization
735 obj.PayPrice[4] = (int)reader.ReadElementContentAsInt("PayPrice4", String.Empty); 737 obj.PayPrice[4] = (int)reader.ReadElementContentAsInt("PayPrice4", String.Empty);
736 } 738 }
737 739
740 private static void ProcessBuoyancy(SceneObjectPart obj, XmlTextReader reader)
741 {
742 obj.Buoyancy = (int)reader.ReadElementContentAsFloat("Buoyancy", String.Empty);
743 }
744
738 #endregion 745 #endregion
739 746
740 #region TaskInventoryXmlProcessors 747 #region TaskInventoryXmlProcessors
@@ -1219,6 +1226,8 @@ namespace OpenSim.Region.Framework.Scenes.Serialization
1219 writer.WriteElementString("PayPrice3", sop.PayPrice[3].ToString()); 1226 writer.WriteElementString("PayPrice3", sop.PayPrice[3].ToString());
1220 writer.WriteElementString("PayPrice4", sop.PayPrice[4].ToString()); 1227 writer.WriteElementString("PayPrice4", sop.PayPrice[4].ToString());
1221 1228
1229 writer.WriteElementString("Buoyancy", sop.Buoyancy.ToString());
1230
1222 writer.WriteEndElement(); 1231 writer.WriteEndElement();
1223 } 1232 }
1224 1233
@@ -1503,12 +1512,6 @@ namespace OpenSim.Region.Framework.Scenes.Serialization
1503 { 1512 {
1504 TaskInventoryDictionary tinv = new TaskInventoryDictionary(); 1513 TaskInventoryDictionary tinv = new TaskInventoryDictionary();
1505 1514
1506 if (reader.IsEmptyElement)
1507 {
1508 reader.Read();
1509 return tinv;
1510 }
1511
1512 reader.ReadStartElement(name, String.Empty); 1515 reader.ReadStartElement(name, String.Empty);
1513 1516
1514 while (reader.Name == "TaskInventoryItem") 1517 while (reader.Name == "TaskInventoryItem")
@@ -1551,12 +1554,6 @@ namespace OpenSim.Region.Framework.Scenes.Serialization
1551 1554
1552 PrimitiveBaseShape shape = new PrimitiveBaseShape(); 1555 PrimitiveBaseShape shape = new PrimitiveBaseShape();
1553 1556
1554 if (reader.IsEmptyElement)
1555 {
1556 reader.Read();
1557 return shape;
1558 }
1559
1560 reader.ReadStartElement(name, String.Empty); // Shape 1557 reader.ReadStartElement(name, String.Empty); // Shape
1561 1558
1562 string nodeName = string.Empty; 1559 string nodeName = string.Empty;
@@ -1596,4 +1593,4 @@ namespace OpenSim.Region.Framework.Scenes.Serialization
1596 1593
1597 #endregion 1594 #endregion
1598 } 1595 }
1599} 1596} \ No newline at end of file
diff --git a/OpenSim/Region/Framework/Scenes/UndoState.cs b/OpenSim/Region/Framework/Scenes/UndoState.cs
index d34d8e5..0a30f4b 100644
--- a/OpenSim/Region/Framework/Scenes/UndoState.cs
+++ b/OpenSim/Region/Framework/Scenes/UndoState.cs
@@ -30,12 +30,27 @@ using System.Reflection;
30using log4net; 30using log4net;
31using OpenMetaverse; 31using OpenMetaverse;
32using OpenSim.Region.Framework.Interfaces; 32using OpenSim.Region.Framework.Interfaces;
33using System;
33 34
34namespace OpenSim.Region.Framework.Scenes 35namespace OpenSim.Region.Framework.Scenes
35{ 36{
37 [Flags]
38 public enum UndoType
39 {
40 STATE_PRIM_POSITION = 1,
41 STATE_PRIM_ROTATION = 2,
42 STATE_PRIM_SCALE = 4,
43 STATE_PRIM_ALL = 7,
44 STATE_GROUP_POSITION = 8,
45 STATE_GROUP_ROTATION = 16,
46 STATE_GROUP_SCALE = 32,
47 STATE_GROUP_ALL = 56,
48 STATE_ALL = 63
49 }
50
36 public class UndoState 51 public class UndoState
37 { 52 {
38// private static readonly ILog m_log = LogManager.GetLogger(MethodBase.GetCurrentMethod().DeclaringType); 53 // private static readonly ILog m_log = LogManager.GetLogger(MethodBase.GetCurrentMethod().DeclaringType);
39 54
40 public Vector3 Position = Vector3.Zero; 55 public Vector3 Position = Vector3.Zero;
41 public Vector3 Scale = Vector3.Zero; 56 public Vector3 Scale = Vector3.Zero;
@@ -57,37 +72,37 @@ namespace OpenSim.Region.Framework.Scenes
57 { 72 {
58 ForGroup = forGroup; 73 ForGroup = forGroup;
59 74
60// if (ForGroup) 75 // if (ForGroup)
61 Position = part.ParentGroup.AbsolutePosition; 76 Position = part.ParentGroup.AbsolutePosition;
62// else 77 // else
63// Position = part.OffsetPosition; 78 // Position = part.OffsetPosition;
64 79
65// m_log.DebugFormat( 80 // m_log.DebugFormat(
66// "[UNDO STATE]: Storing undo position {0} for root part", Position); 81 // "[UNDO STATE]: Storing undo position {0} for root part", Position);
67 82
68 Rotation = part.RotationOffset; 83 Rotation = part.RotationOffset;
69 84
70// m_log.DebugFormat( 85 // m_log.DebugFormat(
71// "[UNDO STATE]: Storing undo rotation {0} for root part", Rotation); 86 // "[UNDO STATE]: Storing undo rotation {0} for root part", Rotation);
72 87
73 Scale = part.Shape.Scale; 88 Scale = part.Shape.Scale;
74 89
75// m_log.DebugFormat( 90 // m_log.DebugFormat(
76// "[UNDO STATE]: Storing undo scale {0} for root part", Scale); 91 // "[UNDO STATE]: Storing undo scale {0} for root part", Scale);
77 } 92 }
78 else 93 else
79 { 94 {
80 Position = part.OffsetPosition; 95 Position = part.OffsetPosition;
81// m_log.DebugFormat( 96 // m_log.DebugFormat(
82// "[UNDO STATE]: Storing undo position {0} for child part", Position); 97 // "[UNDO STATE]: Storing undo position {0} for child part", Position);
83 98
84 Rotation = part.RotationOffset; 99 Rotation = part.RotationOffset;
85// m_log.DebugFormat( 100 // m_log.DebugFormat(
86// "[UNDO STATE]: Storing undo rotation {0} for child part", Rotation); 101 // "[UNDO STATE]: Storing undo rotation {0} for child part", Rotation);
87 102
88 Scale = part.Shape.Scale; 103 Scale = part.Shape.Scale;
89// m_log.DebugFormat( 104 // m_log.DebugFormat(
90// "[UNDO STATE]: Storing undo scale {0} for child part", Scale); 105 // "[UNDO STATE]: Storing undo scale {0} for child part", Scale);
91 } 106 }
92 } 107 }
93 108
@@ -121,9 +136,9 @@ namespace OpenSim.Region.Framework.Scenes
121 136
122 if (part.ParentID == 0) 137 if (part.ParentID == 0)
123 { 138 {
124// m_log.DebugFormat( 139 // m_log.DebugFormat(
125// "[UNDO STATE]: Undoing position to {0} for root part {1} {2}", 140 // "[UNDO STATE]: Undoing position to {0} for root part {1} {2}",
126// Position, part.Name, part.LocalId); 141 // Position, part.Name, part.LocalId);
127 142
128 if (Position != Vector3.Zero) 143 if (Position != Vector3.Zero)
129 { 144 {
@@ -133,9 +148,9 @@ namespace OpenSim.Region.Framework.Scenes
133 part.ParentGroup.UpdateRootPosition(Position); 148 part.ParentGroup.UpdateRootPosition(Position);
134 } 149 }
135 150
136// m_log.DebugFormat( 151 // m_log.DebugFormat(
137// "[UNDO STATE]: Undoing rotation {0} to {1} for root part {2} {3}", 152 // "[UNDO STATE]: Undoing rotation {0} to {1} for root part {2} {3}",
138// part.RotationOffset, Rotation, part.Name, part.LocalId); 153 // part.RotationOffset, Rotation, part.Name, part.LocalId);
139 154
140 if (ForGroup) 155 if (ForGroup)
141 part.UpdateRotation(Rotation); 156 part.UpdateRotation(Rotation);
@@ -144,9 +159,9 @@ namespace OpenSim.Region.Framework.Scenes
144 159
145 if (Scale != Vector3.Zero) 160 if (Scale != Vector3.Zero)
146 { 161 {
147// m_log.DebugFormat( 162 // m_log.DebugFormat(
148// "[UNDO STATE]: Undoing scale {0} to {1} for root part {2} {3}", 163 // "[UNDO STATE]: Undoing scale {0} to {1} for root part {2} {3}",
149// part.Shape.Scale, Scale, part.Name, part.LocalId); 164 // part.Shape.Scale, Scale, part.Name, part.LocalId);
150 165
151 if (ForGroup) 166 if (ForGroup)
152 part.ParentGroup.GroupResize(Scale); 167 part.ParentGroup.GroupResize(Scale);
@@ -160,24 +175,24 @@ namespace OpenSim.Region.Framework.Scenes
160 { 175 {
161 if (Position != Vector3.Zero) 176 if (Position != Vector3.Zero)
162 { 177 {
163// m_log.DebugFormat( 178 // m_log.DebugFormat(
164// "[UNDO STATE]: Undoing position {0} to {1} for child part {2} {3}", 179 // "[UNDO STATE]: Undoing position {0} to {1} for child part {2} {3}",
165// part.OffsetPosition, Position, part.Name, part.LocalId); 180 // part.OffsetPosition, Position, part.Name, part.LocalId);
166 181
167 part.OffsetPosition = Position; 182 part.OffsetPosition = Position;
168 } 183 }
169 184
170// m_log.DebugFormat( 185 // m_log.DebugFormat(
171// "[UNDO STATE]: Undoing rotation {0} to {1} for child part {2} {3}", 186 // "[UNDO STATE]: Undoing rotation {0} to {1} for child part {2} {3}",
172// part.RotationOffset, Rotation, part.Name, part.LocalId); 187 // part.RotationOffset, Rotation, part.Name, part.LocalId);
173 188
174 part.UpdateRotation(Rotation); 189 part.UpdateRotation(Rotation);
175 190
176 if (Scale != Vector3.Zero) 191 if (Scale != Vector3.Zero)
177 { 192 {
178// m_log.DebugFormat( 193 // m_log.DebugFormat(
179// "[UNDO STATE]: Undoing scale {0} to {1} for child part {2} {3}", 194 // "[UNDO STATE]: Undoing scale {0} to {1} for child part {2} {3}",
180// part.Shape.Scale, Scale, part.Name, part.LocalId); 195 // part.Shape.Scale, Scale, part.Name, part.LocalId);
181 196
182 part.Resize(Scale); 197 part.Resize(Scale);
183 } 198 }
@@ -249,4 +264,4 @@ namespace OpenSim.Region.Framework.Scenes
249 m_terrainModule.UndoTerrain(m_terrainChannel); 264 m_terrainModule.UndoTerrain(m_terrainChannel);
250 } 265 }
251 } 266 }
252} \ No newline at end of file 267}
diff --git a/OpenSim/Region/Framework/Scenes/UuidGatherer.cs b/OpenSim/Region/Framework/Scenes/UuidGatherer.cs
index efb68a2..411e421 100644
--- a/OpenSim/Region/Framework/Scenes/UuidGatherer.cs
+++ b/OpenSim/Region/Framework/Scenes/UuidGatherer.cs
@@ -87,10 +87,6 @@ namespace OpenSim.Region.Framework.Scenes
87 /// <param name="assetUuids">The assets gathered</param> 87 /// <param name="assetUuids">The assets gathered</param>
88 public void GatherAssetUuids(UUID assetUuid, AssetType assetType, IDictionary<UUID, AssetType> assetUuids) 88 public void GatherAssetUuids(UUID assetUuid, AssetType assetType, IDictionary<UUID, AssetType> assetUuids)
89 { 89 {
90 // avoid infinite loops
91 if (assetUuids.ContainsKey(assetUuid))
92 return;
93
94 try 90 try
95 { 91 {
96 assetUuids[assetUuid] = assetType; 92 assetUuids[assetUuid] = assetType;
generated by cgit v1.1 at 2024-12-23 20:02:27 +0000