From 633f4bb3d80decf4773ee577bacb153fbb4be738 Mon Sep 17 00:00:00 2001
From: Justin Clark-Casey (justincc)
Date: Tue, 3 Apr 2012 09:28:17 +0100
Subject: remove possible PhysActor unexpectedly null race conditions when
changing prim collision status
factor out common SOP physics scene adding code into a common SOP.AddToPhysics() that is the counterpart to the existing RemoveFromPhysics()
---
OpenSim/Region/Framework/Scenes/Scene.cs | 6 -
OpenSim/Region/Framework/Scenes/SceneObjectPart.cs | 131 ++++++++++++---------
2 files changed, 74 insertions(+), 63 deletions(-)
diff --git a/OpenSim/Region/Framework/Scenes/Scene.cs b/OpenSim/Region/Framework/Scenes/Scene.cs
index 29825a2..d8cac66 100644
--- a/OpenSim/Region/Framework/Scenes/Scene.cs
+++ b/OpenSim/Region/Framework/Scenes/Scene.cs
@@ -2163,12 +2163,6 @@ namespace OpenSim.Region.Framework.Scenes
part.RemoveFromPhysics();
}
}
-
-// if (rootPart.PhysActor != null)
-// {
-// PhysicsScene.RemovePrim(rootPart.PhysActor);
-// rootPart.PhysActor = null;
-// }
if (UnlinkSceneObject(group, false))
{
diff --git a/OpenSim/Region/Framework/Scenes/SceneObjectPart.cs b/OpenSim/Region/Framework/Scenes/SceneObjectPart.cs
index 2b1fba0..9e65f5d 100644
--- a/OpenSim/Region/Framework/Scenes/SceneObjectPart.cs
+++ b/OpenSim/Region/Framework/Scenes/SceneObjectPart.cs
@@ -1488,40 +1488,17 @@ namespace OpenSim.Region.Framework.Scenes
if (VolumeDetectActive)
isPhantom = false;
- // Added clarification.. since A rigid body is an object that you can kick around, etc.
- bool RigidBody = isPhysical && !isPhantom;
-
// The only time the physics scene shouldn't know about the prim is if it's phantom or an attachment, which is phantom by definition
// or flexible
if (!isPhantom && !ParentGroup.IsAttachment && !(Shape.PathCurve == (byte)Extrusion.Flexible))
{
- try
- {
- PhysActor = ParentGroup.Scene.PhysicsScene.AddPrimShape(
- string.Format("{0}/{1}", Name, UUID),
- Shape,
- AbsolutePosition,
- Scale,
- RotationOffset,
- RigidBody,
- m_localId);
- }
- catch
- {
- m_log.ErrorFormat("[SCENE]: caught exception meshing object {0}. Object set to phantom.", m_uuid);
- PhysActor = null;
- }
+ // Added clarification.. since A rigid body is an object that you can kick around, etc.
+ bool rigidBody = isPhysical && !isPhantom;
- // Basic Physics can also return null as well as an exception catch.
- PhysicsActor pa = PhysActor;
+ PhysicsActor pa = AddToPhysics(rigidBody);
if (pa != null)
- {
- pa.SOPName = this.Name; // save object into the PhysActor so ODE internals know the joint/body info
- pa.SetMaterial(Material);
- DoPhysicsPropertyUpdate(RigidBody, true);
pa.SetVolumeDetect(VolumeDetectActive ? 1 : 0);
- }
}
}
}
@@ -4322,41 +4299,36 @@ namespace OpenSim.Region.Framework.Scenes
if (ParentGroup.Scene == null)
return;
- if (ParentGroup.Scene.CollidablePrims && PhysActor == null)
+ if (ParentGroup.Scene.CollidablePrims && pa == null)
{
- // It's not phantom anymore. So make sure the physics engine get's knowledge of it
- PhysActor = ParentGroup.Scene.PhysicsScene.AddPrimShape(
- string.Format("{0}/{1}", Name, UUID),
- Shape,
- AbsolutePosition,
- Scale,
- RotationOffset,
- UsePhysics,
- m_localId);
+ pa = AddToPhysics(UsePhysics);
- PhysActor.SetMaterial(Material);
- DoPhysicsPropertyUpdate(UsePhysics, true);
-
- if (!ParentGroup.IsDeleted)
+ if (pa != null)
{
- if (LocalId == ParentGroup.RootPart.LocalId)
+ pa.SetMaterial(Material);
+ DoPhysicsPropertyUpdate(UsePhysics, true);
+
+ if (!ParentGroup.IsDeleted)
{
- ParentGroup.CheckSculptAndLoad();
+ if (LocalId == ParentGroup.RootPart.LocalId)
+ {
+ ParentGroup.CheckSculptAndLoad();
+ }
+ }
+
+ if (
+ ((AggregateScriptEvents & scriptEvents.collision) != 0) ||
+ ((AggregateScriptEvents & scriptEvents.collision_end) != 0) ||
+ ((AggregateScriptEvents & scriptEvents.collision_start) != 0) ||
+ ((AggregateScriptEvents & scriptEvents.land_collision_start) != 0) ||
+ ((AggregateScriptEvents & scriptEvents.land_collision) != 0) ||
+ ((AggregateScriptEvents & scriptEvents.land_collision_end) != 0) ||
+ (CollisionSound != UUID.Zero)
+ )
+ {
+ pa.OnCollisionUpdate += PhysicsCollision;
+ pa.SubscribeEvents(1000);
}
- }
-
- if (
- ((AggregateScriptEvents & scriptEvents.collision) != 0) ||
- ((AggregateScriptEvents & scriptEvents.collision_end) != 0) ||
- ((AggregateScriptEvents & scriptEvents.collision_start) != 0) ||
- ((AggregateScriptEvents & scriptEvents.land_collision_start) != 0) ||
- ((AggregateScriptEvents & scriptEvents.land_collision) != 0) ||
- ((AggregateScriptEvents & scriptEvents.land_collision_end) != 0) ||
- (CollisionSound != UUID.Zero)
- )
- {
- PhysActor.OnCollisionUpdate += PhysicsCollision;
- PhysActor.SubscribeEvents(1000);
}
}
else // it already has a physical representation
@@ -4418,7 +4390,52 @@ namespace OpenSim.Region.Framework.Scenes
}
///
- /// This removes the part from physics
+ /// Adds this part to the physics scene.
+ ///
+ /// This method also sets the PhysActor property.
+ /// Add this prim with a rigid body.
+ ///
+ /// The physics actor. null if there was a failure.
+ ///
+ private PhysicsActor AddToPhysics(bool rigidBody)
+ {
+ PhysicsActor pa;
+
+ try
+ {
+ pa = ParentGroup.Scene.PhysicsScene.AddPrimShape(
+ string.Format("{0}/{1}", Name, UUID),
+ Shape,
+ AbsolutePosition,
+ Scale,
+ RotationOffset,
+ rigidBody,
+ m_localId);
+ }
+ catch
+ {
+ m_log.ErrorFormat("[SCENE]: caught exception meshing object {0}. Object set to phantom.", m_uuid);
+ pa = null;
+ }
+
+ // FIXME: Ideally we wouldn't set the property here to reduce situations where threads changing physical
+ // properties can stop on each other. However, DoPhysicsPropertyUpdate() currently relies on PhysActor
+ // being set.
+ PhysActor = pa;
+
+ // Basic Physics can also return null as well as an exception catch.
+ if (pa != null)
+ {
+ pa.SOPName = this.Name; // save object into the PhysActor so ODE internals know the joint/body info
+ pa.SetMaterial(Material);
+ DoPhysicsPropertyUpdate(rigidBody, true);
+ }
+
+ return pa;
+ }
+
+ ///
+ /// This removes the part from the physics scene.
///
///
/// This isn't the same as turning off physical, since even without being physical the prim has a physics
--
cgit v1.1
From 627efc172bda961f888dd3191fd8e1c4885f46e3 Mon Sep 17 00:00:00 2001
From: Justin Clark-Casey (justincc)
Date: Fri, 6 Apr 2012 20:32:39 +0100
Subject: Make llGetMass() return total mass of object when called on root
prim.
As per http://lslwiki.net/lslwiki/wakka.php?wakka=llGetMass
Aims to resolve http://opensimulator.org/mantis/view.php?id=5954
---
OpenSim/Region/ScriptEngine/Shared/Api/Implementation/LSL_Api.cs | 5 ++++-
1 file changed, 4 insertions(+), 1 deletion(-)
diff --git a/OpenSim/Region/ScriptEngine/Shared/Api/Implementation/LSL_Api.cs b/OpenSim/Region/ScriptEngine/Shared/Api/Implementation/LSL_Api.cs
index 8d25a62..43b66f4 100644
--- a/OpenSim/Region/ScriptEngine/Shared/Api/Implementation/LSL_Api.cs
+++ b/OpenSim/Region/ScriptEngine/Shared/Api/Implementation/LSL_Api.cs
@@ -2907,7 +2907,10 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api
public LSL_Float llGetMass()
{
m_host.AddScriptLPS(1);
- return m_host.GetMass();
+ if (m_host.IsRoot)
+ return m_host.ParentGroup.GetMass();
+ else
+ return m_host.GetMass();
}
public void llCollisionFilter(string name, string id, int accept)
--
cgit v1.1
From c3a8c00ce0e60b0988fc0d62712e896e5c3e1ac8 Mon Sep 17 00:00:00 2001
From: Talun
Date: Fri, 6 Apr 2012 19:11:09 +0100
Subject: Addition of missing constants for llGetObjectDetails including for
Mantis 5502
Signed-off-by: nebadon
---
.../Shared/Api/Implementation/LSL_Api.cs | 72 ++++++++++++++++++++++
.../Shared/Api/Runtime/LSL_Constants.cs | 10 +++
2 files changed, 82 insertions(+)
diff --git a/OpenSim/Region/ScriptEngine/Shared/Api/Implementation/LSL_Api.cs b/OpenSim/Region/ScriptEngine/Shared/Api/Implementation/LSL_Api.cs
index 43b66f4..a046f29 100644
--- a/OpenSim/Region/ScriptEngine/Shared/Api/Implementation/LSL_Api.cs
+++ b/OpenSim/Region/ScriptEngine/Shared/Api/Implementation/LSL_Api.cs
@@ -10333,6 +10333,35 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api
case ScriptBaseClass.OBJECT_CREATOR:
ret.Add(new LSL_String(UUID.Zero.ToString()));
break;
+ // For the following 8 see the Object version below
+ case ScriptBaseClass.OBJECT_RUNNING_SCRIPT_COUNT:
+ ret.Add(new LSL_Integer(0));
+ break;
+ case ScriptBaseClass.OBJECT_TOTAL_SCRIPT_COUNT:
+ ret.Add(new LSL_Integer(0));
+ break;
+ case ScriptBaseClass.OBJECT_SCRIPT_MEMORY:
+ ret.Add(new LSL_Integer(0));
+ break;
+ case ScriptBaseClass.OBJECT_SCRIPT_TIME:
+ ret.Add(new LSL_Float(0));
+ break;
+ case ScriptBaseClass.OBJECT_PRIM_EQUIVALENCE:
+ ret.Add(new LSL_Integer(0));
+ break;
+ case ScriptBaseClass.OBJECT_SERVER_COST:
+ ret.Add(new LSL_Float(0));
+ break;
+ case ScriptBaseClass.OBJECT_STREAMING_COST:
+ ret.Add(new LSL_Float(0));
+ break;
+ case ScriptBaseClass.OBJECT_PHYSICS_COST:
+ ret.Add(new LSL_Float(0));
+ break;
+ default:
+ // Invalid or unhandled constant.
+ ret.Add(new LSL_Integer(ScriptBaseClass.OBJECT_UNKNOWN_DETAIL));
+ break;
}
}
@@ -10370,6 +10399,49 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api
case ScriptBaseClass.OBJECT_CREATOR:
ret.Add(new LSL_String(obj.CreatorID.ToString()));
break;
+ // The following 8 I have intentionaly coded to return zero. They are part of
+ // "Land Impact" calculations. These calculations are probably not applicable
+ // to OpenSim, required figures (cpu/memory usage) are not currently tracked
+ // I have intentionally left these all at zero rather than return possibly
+ // missleading numbers
+ case ScriptBaseClass.OBJECT_RUNNING_SCRIPT_COUNT:
+ // in SL this currently includes crashed scripts
+ ret.Add(new LSL_Integer(0));
+ break;
+ case ScriptBaseClass.OBJECT_TOTAL_SCRIPT_COUNT:
+ ret.Add(new LSL_Integer(0));
+ break;
+ case ScriptBaseClass.OBJECT_SCRIPT_MEMORY:
+ // The value returned in SL for mono scripts is 65536 * number of active scripts
+ ret.Add(new LSL_Integer(0));
+ break;
+ case ScriptBaseClass.OBJECT_SCRIPT_TIME:
+ // Average cpu time per simulator frame expended on all scripts in the objetc
+ ret.Add(new LSL_Float(0));
+ break;
+ case ScriptBaseClass.OBJECT_PRIM_EQUIVALENCE:
+ // according to the SL wiki A prim or linkset will have prim
+ // equivalent of the number of prims in a linkset if it does not
+ // contain a mesh anywhere in the link set or is not a normal prim
+ // The value returned in SL for normal prims is prim count
+ ret.Add(new LSL_Integer(0));
+ break;
+ case ScriptBaseClass.OBJECT_SERVER_COST:
+ // The value returned in SL for normal prims is prim count
+ ret.Add(new LSL_Float(0));
+ break;
+ case ScriptBaseClass.OBJECT_STREAMING_COST:
+ // The value returned in SL for normal prims is prim count * 0.06
+ ret.Add(new LSL_Float(0));
+ break;
+ case ScriptBaseClass.OBJECT_PHYSICS_COST:
+ // The value returned in SL for normal prims is prim count
+ ret.Add(new LSL_Float(0));
+ break;
+ default:
+ // Invalid or unhandled constant.
+ ret.Add(new LSL_Integer(ScriptBaseClass.OBJECT_UNKNOWN_DETAIL));
+ break;
}
}
diff --git a/OpenSim/Region/ScriptEngine/Shared/Api/Runtime/LSL_Constants.cs b/OpenSim/Region/ScriptEngine/Shared/Api/Runtime/LSL_Constants.cs
index 5a53e15..f58f9d6 100644
--- a/OpenSim/Region/ScriptEngine/Shared/Api/Runtime/LSL_Constants.cs
+++ b/OpenSim/Region/ScriptEngine/Shared/Api/Runtime/LSL_Constants.cs
@@ -479,6 +479,8 @@ namespace OpenSim.Region.ScriptEngine.Shared.ScriptBase
public const int DEBUG_CHANNEL = 0x7FFFFFFF;
public const int PUBLIC_CHANNEL = 0x00000000;
+ // Constants for llGetObjectDetails
+ public const int OBJECT_UNKNOWN_DETAIL = -1;
public const int OBJECT_NAME = 1;
public const int OBJECT_DESC = 2;
public const int OBJECT_POS = 3;
@@ -487,6 +489,14 @@ namespace OpenSim.Region.ScriptEngine.Shared.ScriptBase
public const int OBJECT_OWNER = 6;
public const int OBJECT_GROUP = 7;
public const int OBJECT_CREATOR = 8;
+ public const int OBJECT_RUNNING_SCRIPT_COUNT = 9;
+ public const int OBJECT_TOTAL_SCRIPT_COUNT = 10;
+ public const int OBJECT_SCRIPT_MEMORY = 11;
+ public const int OBJECT_SCRIPT_TIME = 12;
+ public const int OBJECT_PRIM_EQUIVALENCE = 13;
+ public const int OBJECT_SERVER_COST = 14;
+ public const int OBJECT_STREAMING_COST = 15;
+ public const int OBJECT_PHYSICS_COST = 16;
// Can not be public const?
public static readonly vector ZERO_VECTOR = new vector(0.0, 0.0, 0.0);
--
cgit v1.1
From f2903db39009c7e62f6a07c545183b9588bff775 Mon Sep 17 00:00:00 2001
From: Justin Clark-Casey (justincc)
Date: Fri, 6 Apr 2012 21:14:19 +0100
Subject: For llGetMass(), return the mass of the avatar is the object is
attached.
As per http://lslwiki.net/lslwiki/wakka.php?wakka=llGetMass
This is the mass as used by the physics engine (ODE or Bullet).
---
OpenSim/Region/Framework/Scenes/ScenePresence.cs | 16 +++++++++++++
.../Shared/Api/Implementation/LSL_Api.cs | 27 +++++++++++++++++++---
2 files changed, 40 insertions(+), 3 deletions(-)
diff --git a/OpenSim/Region/Framework/Scenes/ScenePresence.cs b/OpenSim/Region/Framework/Scenes/ScenePresence.cs
index 19dab32..a21c66f 100644
--- a/OpenSim/Region/Framework/Scenes/ScenePresence.cs
+++ b/OpenSim/Region/Framework/Scenes/ScenePresence.cs
@@ -3514,6 +3514,22 @@ namespace OpenSim.Region.Framework.Scenes
});
}
+ ///
+ /// Gets the mass.
+ ///
+ ///
+ /// The mass.
+ ///
+ public float GetMass()
+ {
+ PhysicsActor pa = PhysicsActor;
+
+ if (pa != null)
+ return pa.Mass;
+ else
+ return 0;
+ }
+
internal void PushForce(Vector3 impulse)
{
if (PhysicsActor != null)
diff --git a/OpenSim/Region/ScriptEngine/Shared/Api/Implementation/LSL_Api.cs b/OpenSim/Region/ScriptEngine/Shared/Api/Implementation/LSL_Api.cs
index 43b66f4..17f5a64 100644
--- a/OpenSim/Region/ScriptEngine/Shared/Api/Implementation/LSL_Api.cs
+++ b/OpenSim/Region/ScriptEngine/Shared/Api/Implementation/LSL_Api.cs
@@ -2907,10 +2907,31 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api
public LSL_Float llGetMass()
{
m_host.AddScriptLPS(1);
- if (m_host.IsRoot)
- return m_host.ParentGroup.GetMass();
+
+ if (m_host.ParentGroup.IsAttachment)
+ {
+ ScenePresence attachedAvatar = World.GetScenePresence(m_host.ParentGroup.AttachedAvatar);
+
+ if (attachedAvatar != null)
+ {
+ return attachedAvatar.GetMass();
+ }
+ else
+ {
+ return 0;
+ }
+ }
else
- return m_host.GetMass();
+ {
+ if (m_host.IsRoot)
+ {
+ return m_host.ParentGroup.GetMass();
+ }
+ else
+ {
+ return m_host.GetMass();
+ }
+ }
}
public void llCollisionFilter(string name, string id, int accept)
--
cgit v1.1
From 3af1cd65f91db87778096196bfd985dc48c72d87 Mon Sep 17 00:00:00 2001
From: Justin Clark-Casey (justincc)
Date: Fri, 6 Apr 2012 22:41:35 +0100
Subject: Fix llGetLinkPrimParams for PRIM_POS_LOCAL for child prims whether in
scene or attachments.
Return relative position to root prim rather than 0,0,0.
Should fix same issue with llGetLocalPos()
http://opensimulator.org/mantis/view.php?id=5951
---
OpenSim/Region/Framework/Scenes/SceneObjectPart.cs | 16 +++++++++++++---
.../Shared/Api/Implementation/LSL_Api.cs | 21 +++++++++++----------
2 files changed, 24 insertions(+), 13 deletions(-)
diff --git a/OpenSim/Region/Framework/Scenes/SceneObjectPart.cs b/OpenSim/Region/Framework/Scenes/SceneObjectPart.cs
index 9e65f5d..5ec0ed9 100644
--- a/OpenSim/Region/Framework/Scenes/SceneObjectPart.cs
+++ b/OpenSim/Region/Framework/Scenes/SceneObjectPart.cs
@@ -125,12 +125,14 @@ namespace OpenSim.Region.Framework.Scenes
private static readonly ILog m_log = LogManager.GetLogger(MethodBase.GetCurrentMethod().DeclaringType);
///
- /// Is this sop a root part?
+ /// Is this a root part?
///
-
+ ///
+ /// This will return true even if the whole object is attached to an avatar.
+ ///
public bool IsRoot
{
- get { return ParentGroup.RootPart == this; }
+ get { return ParentGroup.RootPart == this; }
}
#region Fields
@@ -1112,6 +1114,14 @@ namespace OpenSim.Region.Framework.Scenes
}
}
+ ///
+ /// The parent ID of this part.
+ ///
+ ///
+ /// If this is a root part which is not attached to an avatar then the value will be 0.
+ /// If this is a root part which is attached to an avatar then the value is the local id of that avatar.
+ /// If this is a child part then the value is the local ID of the root part.
+ ///
public uint ParentID
{
get { return _parentID; }
diff --git a/OpenSim/Region/ScriptEngine/Shared/Api/Implementation/LSL_Api.cs b/OpenSim/Region/ScriptEngine/Shared/Api/Implementation/LSL_Api.cs
index a85a36e..ad73f47 100644
--- a/OpenSim/Region/ScriptEngine/Shared/Api/Implementation/LSL_Api.cs
+++ b/OpenSim/Region/ScriptEngine/Shared/Api/Implementation/LSL_Api.cs
@@ -2022,27 +2022,28 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api
protected LSL_Vector GetPartLocalPos(SceneObjectPart part)
{
m_host.AddScriptLPS(1);
+
+ Vector3 pos;
+
if (part.ParentID == 0)
{
- return new LSL_Vector(part.AbsolutePosition.X,
- part.AbsolutePosition.Y,
- part.AbsolutePosition.Z);
+ pos = part.AbsolutePosition;
}
else
{
- if (m_host.IsRoot)
+ if (part.IsRoot)
{
- return new LSL_Vector(m_host.AttachedPos.X,
- m_host.AttachedPos.Y,
- m_host.AttachedPos.Z);
+ pos = part.AttachedPos;
}
else
{
- return new LSL_Vector(part.OffsetPosition.X,
- part.OffsetPosition.Y,
- part.OffsetPosition.Z);
+ pos = part.OffsetPosition;
}
}
+
+// m_log.DebugFormat("[LSL API]: Returning {0} in GetPartLocalPos()", pos);
+
+ return new LSL_Vector(pos.X, pos.Y, pos.Z);
}
public void llSetRot(LSL_Rotation rot)
--
cgit v1.1
From 4a58d4c5a4e7e405448113a0efd5c34349eed7b5 Mon Sep 17 00:00:00 2001
From: Justin Clark-Casey (justincc)
Date: Fri, 6 Apr 2012 23:36:13 +0100
Subject: refactor: Use clearer part.ParentGroup.IsAttachment in
LSL_Api.GetPartLocalPos()
---
OpenSim/Region/ScriptEngine/Shared/Api/Implementation/LSL_Api.cs | 8 ++++----
1 file changed, 4 insertions(+), 4 deletions(-)
diff --git a/OpenSim/Region/ScriptEngine/Shared/Api/Implementation/LSL_Api.cs b/OpenSim/Region/ScriptEngine/Shared/Api/Implementation/LSL_Api.cs
index ad73f47..021b352 100644
--- a/OpenSim/Region/ScriptEngine/Shared/Api/Implementation/LSL_Api.cs
+++ b/OpenSim/Region/ScriptEngine/Shared/Api/Implementation/LSL_Api.cs
@@ -2025,19 +2025,19 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api
Vector3 pos;
- if (part.ParentID == 0)
+ if (!part.IsRoot)
{
- pos = part.AbsolutePosition;
+ pos = part.OffsetPosition;
}
else
{
- if (part.IsRoot)
+ if (part.ParentGroup.IsAttachment)
{
pos = part.AttachedPos;
}
else
{
- pos = part.OffsetPosition;
+ pos = part.AbsolutePosition;
}
}
--
cgit v1.1
From 33e91f1088ce055fa52f34cabc2d211fcc587b5f Mon Sep 17 00:00:00 2001
From: Justin Clark-Casey (justincc)
Date: Fri, 6 Apr 2012 23:43:03 +0100
Subject: Implement PRIM_POS_LOCAL on llSetPrimitiveParams() and other prim
params LSL functions.
This is the same as PRIM_POSITION
---
OpenSim/Region/ScriptEngine/Shared/Api/Implementation/LSL_Api.cs | 1 +
1 file changed, 1 insertion(+)
diff --git a/OpenSim/Region/ScriptEngine/Shared/Api/Implementation/LSL_Api.cs b/OpenSim/Region/ScriptEngine/Shared/Api/Implementation/LSL_Api.cs
index 021b352..8223d95 100644
--- a/OpenSim/Region/ScriptEngine/Shared/Api/Implementation/LSL_Api.cs
+++ b/OpenSim/Region/ScriptEngine/Shared/Api/Implementation/LSL_Api.cs
@@ -7171,6 +7171,7 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api
switch (code)
{
case (int)ScriptBaseClass.PRIM_POSITION:
+ case (int)ScriptBaseClass.PRIM_POS_LOCAL:
if (remain < 1)
return;
--
cgit v1.1
From 70b5a2dacede6b44327856970185471adf808f3c Mon Sep 17 00:00:00 2001
From: Justin Clark-Casey (justincc)
Date: Fri, 6 Apr 2012 23:49:23 +0100
Subject: refactor: Eliminate unnecessary SOP.m_physActor
---
OpenSim/Region/Framework/Scenes/SceneObjectPart.cs | 11 +----------
1 file changed, 1 insertion(+), 10 deletions(-)
diff --git a/OpenSim/Region/Framework/Scenes/SceneObjectPart.cs b/OpenSim/Region/Framework/Scenes/SceneObjectPart.cs
index 5ec0ed9..2fcce1c 100644
--- a/OpenSim/Region/Framework/Scenes/SceneObjectPart.cs
+++ b/OpenSim/Region/Framework/Scenes/SceneObjectPart.cs
@@ -161,15 +161,7 @@ namespace OpenSim.Region.Framework.Scenes
/// If another thread is simultaneously turning physics off on this part then this refernece could become
/// null at any time.
///
- public PhysicsActor PhysActor
- {
- get { return m_physActor; }
- set
- {
-// m_log.DebugFormat("[SOP]: PhysActor set to {0} for {1} {2}", value, Name, UUID);
- m_physActor = value;
- }
- }
+ public PhysicsActor PhysActor { get; set; }
//Xantor 20080528 Sound stuff:
// Note: This isn't persisted in the database right now, as the fields for that aren't just there yet.
@@ -268,7 +260,6 @@ namespace OpenSim.Region.Framework.Scenes
private bool m_passTouches;
- private PhysicsActor m_physActor;
protected Vector3 m_acceleration;
protected Vector3 m_angularVelocity;
--
cgit v1.1
From 7d8bb33c5b2420d4e744269f67a25dd2b9746a35 Mon Sep 17 00:00:00 2001
From: Justin Clark-Casey (justincc)
Date: Sat, 7 Apr 2012 00:33:02 +0100
Subject: Store FromItemID for attachments once on SOG instead of on every SOP
and only ever using the root part entry.
This eliminates some pointless memory use.
---
.../Region/ClientStack/Linden/UDP/LLClientView.cs | 2 +-
.../Avatar/Attachments/AttachmentsModule.cs | 20 ++++++++--------
.../Attachments/Tests/AttachmentsModuleTests.cs | 5 ++--
.../InventoryAccess/InventoryAccessModule.cs | 2 +-
OpenSim/Region/Framework/Scenes/Scene.cs | 2 +-
.../Region/Framework/Scenes/SceneObjectGroup.cs | 28 ++++++++++------------
OpenSim/Region/Framework/Scenes/SceneObjectPart.cs | 2 --
.../Shared/Api/Implementation/LSL_Api.cs | 2 +-
8 files changed, 29 insertions(+), 34 deletions(-)
diff --git a/OpenSim/Region/ClientStack/Linden/UDP/LLClientView.cs b/OpenSim/Region/ClientStack/Linden/UDP/LLClientView.cs
index 9395233..619ef14 100644
--- a/OpenSim/Region/ClientStack/Linden/UDP/LLClientView.cs
+++ b/OpenSim/Region/ClientStack/Linden/UDP/LLClientView.cs
@@ -4957,7 +4957,7 @@ namespace OpenSim.Region.ClientStack.LindenUDP
update.MediaURL = Utils.EmptyBytes; // FIXME: Support this in OpenSim
if (data.ParentGroup.IsAttachment)
{
- update.NameValue = Util.StringToBytes256("AttachItemID STRING RW SV " + data.FromItemID);
+ update.NameValue = Util.StringToBytes256("AttachItemID STRING RW SV " + data.ParentGroup.FromItemID);
update.State = (byte)((data.ParentGroup.AttachmentPoint % 16) * 16 + (data.ParentGroup.AttachmentPoint / 16));
}
else
diff --git a/OpenSim/Region/CoreModules/Avatar/Attachments/AttachmentsModule.cs b/OpenSim/Region/CoreModules/Avatar/Attachments/AttachmentsModule.cs
index 7086e6c..faa413e 100644
--- a/OpenSim/Region/CoreModules/Avatar/Attachments/AttachmentsModule.cs
+++ b/OpenSim/Region/CoreModules/Avatar/Attachments/AttachmentsModule.cs
@@ -239,7 +239,7 @@ namespace OpenSim.Region.CoreModules.Avatar.Attachments
// At the moment we can only deal with a single attachment
if (attachments.Count != 0)
{
- UUID oldAttachmentItemID = attachments[0].GetFromItemID();
+ UUID oldAttachmentItemID = attachments[0].FromItemID;
if (oldAttachmentItemID != UUID.Zero)
DetachSingleAttachmentToInvInternal(sp, oldAttachmentItemID);
@@ -250,7 +250,7 @@ namespace OpenSim.Region.CoreModules.Avatar.Attachments
}
// Add the new attachment to inventory if we don't already have it.
- UUID newAttachmentItemID = group.GetFromItemID();
+ UUID newAttachmentItemID = group.FromItemID;
if (newAttachmentItemID == UUID.Zero)
newAttachmentItemID = AddSceneObjectAsNewAttachmentInInv(sp, group).ID;
@@ -285,7 +285,7 @@ namespace OpenSim.Region.CoreModules.Avatar.Attachments
List existingAttachments = sp.GetAttachments();
foreach (SceneObjectGroup so in existingAttachments)
{
- if (so.GetFromItemID() == itemID)
+ if (so.FromItemID == itemID)
{
alreadyOn = true;
break;
@@ -342,7 +342,7 @@ namespace OpenSim.Region.CoreModules.Avatar.Attachments
if (so.AttachedAvatar != sp.UUID)
return;
- UUID inventoryID = so.GetFromItemID();
+ UUID inventoryID = so.FromItemID;
// m_log.DebugFormat(
// "[ATTACHMENTS MODULE]: In DetachSingleAttachmentToGround(), object is {0} {1}, associated item is {2}",
@@ -359,9 +359,9 @@ namespace OpenSim.Region.CoreModules.Avatar.Attachments
m_scene.AvatarFactory.QueueAppearanceSave(sp.UUID);
sp.RemoveAttachment(so);
+ so.FromItemID = UUID.Zero;
SceneObjectPart rootPart = so.RootPart;
- rootPart.FromItemID = UUID.Zero;
so.AbsolutePosition = sp.AbsolutePosition;
so.AttachedAvatar = UUID.Zero;
rootPart.SetParentLocalId(0);
@@ -475,7 +475,7 @@ namespace OpenSim.Region.CoreModules.Avatar.Attachments
string sceneObjectXml = SceneObjectSerializer.ToOriginalXmlFormat(grp);
- InventoryItemBase item = new InventoryItemBase(grp.GetFromItemID(), sp.UUID);
+ InventoryItemBase item = new InventoryItemBase(grp.FromItemID, sp.UUID);
item = m_scene.InventoryService.GetItem(item);
if (item != null)
@@ -647,7 +647,7 @@ namespace OpenSim.Region.CoreModules.Avatar.Attachments
item.CreationDate = Util.UnixTimeSinceEpoch();
// sets itemID so client can show item as 'attached' in inventory
- grp.SetFromItemID(item.ID);
+ grp.FromItemID = item.ID;
if (m_scene.AddInventoryItem(item))
{
@@ -683,7 +683,7 @@ namespace OpenSim.Region.CoreModules.Avatar.Attachments
if (entity is SceneObjectGroup)
{
group = (SceneObjectGroup)entity;
- if (group.GetFromItemID() == itemID)
+ if (group.FromItemID == itemID)
{
m_scene.EventManager.TriggerOnAttach(group.LocalId, itemID, UUID.Zero);
sp.RemoveAttachment(group);
@@ -889,7 +889,7 @@ namespace OpenSim.Region.CoreModules.Avatar.Attachments
// Calls attach with a Zero position
if (AttachObject(sp, part.ParentGroup, AttachmentPt, false))
{
- m_scene.EventManager.TriggerOnAttach(objectLocalID, part.ParentGroup.GetFromItemID(), remoteClient.AgentId);
+ m_scene.EventManager.TriggerOnAttach(objectLocalID, part.ParentGroup.FromItemID, remoteClient.AgentId);
// Save avatar attachment information
m_log.Debug(
@@ -912,7 +912,7 @@ namespace OpenSim.Region.CoreModules.Avatar.Attachments
ScenePresence sp = m_scene.GetScenePresence(remoteClient.AgentId);
SceneObjectGroup group = m_scene.GetGroupByPrim(objectLocalID);
if (sp != null && group != null)
- DetachSingleAttachmentToInv(sp, group.GetFromItemID());
+ DetachSingleAttachmentToInv(sp, group.FromItemID);
}
private void Client_OnDetachAttachmentIntoInv(UUID itemID, IClientAPI remoteClient)
diff --git a/OpenSim/Region/CoreModules/Avatar/Attachments/Tests/AttachmentsModuleTests.cs b/OpenSim/Region/CoreModules/Avatar/Attachments/Tests/AttachmentsModuleTests.cs
index 86cfb32..bfe5e4a 100644
--- a/OpenSim/Region/CoreModules/Avatar/Attachments/Tests/AttachmentsModuleTests.cs
+++ b/OpenSim/Region/CoreModules/Avatar/Attachments/Tests/AttachmentsModuleTests.cs
@@ -120,8 +120,9 @@ namespace OpenSim.Region.CoreModules.Avatar.Attachments.Tests
Assert.That(attSo.IsTemporary, Is.False);
// Check item status
- Assert.That(m_presence.Appearance.GetAttachpoint(
- attSo.GetFromItemID()), Is.EqualTo((int)AttachmentPoint.Chest));
+ Assert.That(
+ m_presence.Appearance.GetAttachpoint(attSo.FromItemID),
+ Is.EqualTo((int)AttachmentPoint.Chest));
}
[Test]
diff --git a/OpenSim/Region/CoreModules/Framework/InventoryAccess/InventoryAccessModule.cs b/OpenSim/Region/CoreModules/Framework/InventoryAccess/InventoryAccessModule.cs
index 4dd89d2..88c21af 100644
--- a/OpenSim/Region/CoreModules/Framework/InventoryAccess/InventoryAccessModule.cs
+++ b/OpenSim/Region/CoreModules/Framework/InventoryAccess/InventoryAccessModule.cs
@@ -1008,7 +1008,7 @@ namespace OpenSim.Region.CoreModules.Framework.InventoryAccess
rootPart.TrimPermissions();
if (isAttachment)
- so.SetFromItemID(item.ID);
+ so.FromItemID = item.ID;
}
return true;
diff --git a/OpenSim/Region/Framework/Scenes/Scene.cs b/OpenSim/Region/Framework/Scenes/Scene.cs
index d8cac66..e488fe1 100644
--- a/OpenSim/Region/Framework/Scenes/Scene.cs
+++ b/OpenSim/Region/Framework/Scenes/Scene.cs
@@ -2566,7 +2566,7 @@ namespace OpenSim.Region.Framework.Scenes
SceneObjectGroup grp = sceneObject;
m_log.DebugFormat(
- "[ATTACHMENT]: Received attachment {0}, inworld asset id {1}", grp.GetFromItemID(), grp.UUID);
+ "[ATTACHMENT]: Received attachment {0}, inworld asset id {1}", grp.FromItemID, grp.UUID);
m_log.DebugFormat(
"[ATTACHMENT]: Attach to avatar {0} at position {1}", sp.UUID, grp.AbsolutePosition);
diff --git a/OpenSim/Region/Framework/Scenes/SceneObjectGroup.cs b/OpenSim/Region/Framework/Scenes/SceneObjectGroup.cs
index 87fdc41..3586e95 100644
--- a/OpenSim/Region/Framework/Scenes/SceneObjectGroup.cs
+++ b/OpenSim/Region/Framework/Scenes/SceneObjectGroup.cs
@@ -571,7 +571,9 @@ namespace OpenSim.Region.Framework.Scenes
set { m_LoopSoundSlavePrims = value; }
}
- // The UUID for the Region this Object is in.
+ ///
+ /// The UUID for the region this object is in.
+ ///
public UUID RegionUUID
{
get
@@ -584,6 +586,11 @@ namespace OpenSim.Region.Framework.Scenes
}
}
+ ///
+ /// The item ID that this object was rezzed from, if applicable.
+ ///
+ public UUID FromItemID { get; set; }
+
#endregion
// ~SceneObjectGroup()
@@ -646,18 +653,6 @@ namespace OpenSim.Region.Framework.Scenes
}
}
- public void SetFromItemID(UUID AssetId)
- {
- SceneObjectPart[] parts = m_parts.GetArray();
- for (int i = 0; i < parts.Length; i++)
- parts[i].FromItemID = AssetId;
- }
-
- public UUID GetFromItemID()
- {
- return m_rootPart.FromItemID;
- }
-
///
/// Hooks this object up to the backup event so that it is persisted to the database when the update thread executes.
///
@@ -2687,6 +2682,7 @@ namespace OpenSim.Region.Framework.Scenes
{
m_rootPart.AttachedPos = pos;
}
+
if (RootPart.GetStatusSandbox())
{
if (Util.GetDistanceTo(RootPart.StatusSandboxPos, pos) > 10)
@@ -2697,8 +2693,8 @@ namespace OpenSim.Region.Framework.Scenes
ChatTypeEnum.DebugChannel, 0x7FFFFFFF, RootPart.AbsolutePosition, Name, UUID, false);
}
}
- AbsolutePosition = pos;
+ AbsolutePosition = pos;
HasGroupChanged = true;
}
@@ -3270,7 +3266,7 @@ namespace OpenSim.Region.Framework.Scenes
public virtual string ExtraToXmlString()
{
- return "" + GetFromItemID().ToString() + "";
+ return "" + FromItemID.ToString() + "";
}
public virtual void ExtraFromXmlString(string xmlstr)
@@ -3282,7 +3278,7 @@ namespace OpenSim.Region.Framework.Scenes
UUID uuid = UUID.Zero;
UUID.TryParse(id, out uuid);
- SetFromItemID(uuid);
+ FromItemID = uuid;
}
#endregion
diff --git a/OpenSim/Region/Framework/Scenes/SceneObjectPart.cs b/OpenSim/Region/Framework/Scenes/SceneObjectPart.cs
index 2fcce1c..fffaa06 100644
--- a/OpenSim/Region/Framework/Scenes/SceneObjectPart.cs
+++ b/OpenSim/Region/Framework/Scenes/SceneObjectPart.cs
@@ -181,8 +181,6 @@ namespace OpenSim.Region.Framework.Scenes
public uint TimeStampLastActivity; // Will be used for AutoReturn
public uint TimeStampTerse;
-
- public UUID FromItemID;
public UUID FromFolderID;
diff --git a/OpenSim/Region/ScriptEngine/Shared/Api/Implementation/LSL_Api.cs b/OpenSim/Region/ScriptEngine/Shared/Api/Implementation/LSL_Api.cs
index 8223d95..291f52e 100644
--- a/OpenSim/Region/ScriptEngine/Shared/Api/Implementation/LSL_Api.cs
+++ b/OpenSim/Region/ScriptEngine/Shared/Api/Implementation/LSL_Api.cs
@@ -3080,7 +3080,7 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api
SceneObjectPart host = (SceneObjectPart)o;
SceneObjectGroup grp = host.ParentGroup;
- UUID itemID = grp.GetFromItemID();
+ UUID itemID = grp.FromItemID;
ScenePresence presence = World.GetScenePresence(host.OwnerID);
IAttachmentsModule attachmentsModule = m_ScriptEngine.World.AttachmentsModule;
--
cgit v1.1
From cce760dbfcd375a700e38b8279b0c19c5624e720 Mon Sep 17 00:00:00 2001
From: Justin Clark-Casey (justincc)
Date: Sat, 7 Apr 2012 00:40:55 +0100
Subject: Rather than having a FromFolderID property on every single prim and
only ever using the root prim one, store on SOG instead.
This reduces pointless memory usage.
---
OpenSim/Region/ClientStack/Linden/UDP/LLClientView.cs | 2 +-
.../InventoryAccess/InventoryAccessModule.cs | 6 +++---
OpenSim/Region/Framework/Scenes/SceneObjectGroup.cs | 19 +++++++++++++++----
OpenSim/Region/Framework/Scenes/SceneObjectPart.cs | 2 --
4 files changed, 19 insertions(+), 10 deletions(-)
diff --git a/OpenSim/Region/ClientStack/Linden/UDP/LLClientView.cs b/OpenSim/Region/ClientStack/Linden/UDP/LLClientView.cs
index 619ef14..ae5cbff 100644
--- a/OpenSim/Region/ClientStack/Linden/UDP/LLClientView.cs
+++ b/OpenSim/Region/ClientStack/Linden/UDP/LLClientView.cs
@@ -4271,7 +4271,7 @@ namespace OpenSim.Region.ClientStack.LindenUDP
block.OwnerID = sop.OwnerID;
block.ItemID = sop.FromUserInventoryItemID;
- block.FolderID = UUID.Zero; // sop.FromFolderID ??
+ block.FolderID = UUID.Zero; // sog.FromFolderID ??
block.FromTaskID = UUID.Zero; // ???
block.InventorySerial = (short)sop.InventorySerial;
diff --git a/OpenSim/Region/CoreModules/Framework/InventoryAccess/InventoryAccessModule.cs b/OpenSim/Region/CoreModules/Framework/InventoryAccess/InventoryAccessModule.cs
index 88c21af..8171487 100644
--- a/OpenSim/Region/CoreModules/Framework/InventoryAccess/InventoryAccessModule.cs
+++ b/OpenSim/Region/CoreModules/Framework/InventoryAccess/InventoryAccessModule.cs
@@ -654,9 +654,9 @@ namespace OpenSim.Region.CoreModules.Framework.InventoryAccess
//
if (action == DeRezAction.Take || action == DeRezAction.TakeCopy)
{
- if (so.RootPart.FromFolderID != UUID.Zero && userID == remoteClient.AgentId)
+ if (so.FromFolderID != UUID.Zero && userID == remoteClient.AgentId)
{
- InventoryFolderBase f = new InventoryFolderBase(so.RootPart.FromFolderID, userID);
+ InventoryFolderBase f = new InventoryFolderBase(so.FromFolderID, userID);
folder = m_Scene.InventoryService.GetFolder(f);
}
}
@@ -962,7 +962,7 @@ namespace OpenSim.Region.CoreModules.Framework.InventoryAccess
rootPart.SalePrice = item.SalePrice;
}
- rootPart.FromFolderID = item.Folder;
+ so.FromFolderID = item.Folder;
// Console.WriteLine("rootPart.OwnedID {0}, item.Owner {1}, item.CurrentPermissions {2:X}",
// rootPart.OwnerID, item.Owner, item.CurrentPermissions);
diff --git a/OpenSim/Region/Framework/Scenes/SceneObjectGroup.cs b/OpenSim/Region/Framework/Scenes/SceneObjectGroup.cs
index 3586e95..17f3be7 100644
--- a/OpenSim/Region/Framework/Scenes/SceneObjectGroup.cs
+++ b/OpenSim/Region/Framework/Scenes/SceneObjectGroup.cs
@@ -586,10 +586,21 @@ namespace OpenSim.Region.Framework.Scenes
}
}
- ///
- /// The item ID that this object was rezzed from, if applicable.
- ///
- public UUID FromItemID { get; set; }
+ ///
+ /// The item ID that this object was rezzed from, if applicable.
+ ///
+ ///
+ /// If not applicable will be UUID.Zero
+ ///
+ public UUID FromItemID { get; set; }
+
+ ///
+ /// The folder ID that this object was rezzed from, if applicable.
+ ///
+ ///
+ /// If not applicable will be UUID.Zero
+ ///
+ public UUID FromFolderID { get; set; }
#endregion
diff --git a/OpenSim/Region/Framework/Scenes/SceneObjectPart.cs b/OpenSim/Region/Framework/Scenes/SceneObjectPart.cs
index fffaa06..046553b 100644
--- a/OpenSim/Region/Framework/Scenes/SceneObjectPart.cs
+++ b/OpenSim/Region/Framework/Scenes/SceneObjectPart.cs
@@ -182,8 +182,6 @@ namespace OpenSim.Region.Framework.Scenes
public uint TimeStampTerse;
- public UUID FromFolderID;
-
public int STATUS_ROTATE_X;
public int STATUS_ROTATE_Y;
--
cgit v1.1