| Anonymous | Login | Signup for a new account | 2020-01-20 07:02 PST |  |
| Main | My View | View Issues | Change Log | Roadmap | Summary | My Account |
| View Issue Details [ Jump to Notes ] | [ Issue History ] [ Print ] | ||||||||
| ID | Project | Category | View Status | Date Submitted | Last Update | ||||
| 0004475 | opensim | [REGION] Script Functions | public | 2009-12-30 21:23 | 2018-01-26 02:00 | ||||
| Reporter | Revolution | ||||||||
| Assigned To | melanie | ||||||||
| Priority | normal | Severity | minor | Reproducibility | always | ||||
| Status | closed | Resolution | fixed | ||||||
| Platform | OS | OS Version | |||||||
| Product Version | |||||||||
| Target Version | Fixed in Version | ||||||||
| Summary | 0004475: Adds llCollisionFilter | ||||||||
| Description | This adds llCollisionFilter and its respective functionality. WARNING: This patch is based of MY understanding of what this function does. If there is something wrong with how I implemented it, please tell me. I am NOT sure this is correct. | ||||||||
| Tags | No tags attached. | ||||||||
| Git Revision or version number | master as of 12-30-09 | ||||||||
| Run Mode | Standalone (Multiple Regions) | ||||||||
| Physics Engine | ODE | ||||||||
| Script Engine | |||||||||
| Environment | .NET / Windows32 | ||||||||
| Mono Version | None | ||||||||
| Viewer | |||||||||
| Attached Files |  0001-Adds-llCollisionFilter.patch [^] (26,463 bytes) 2009-12-30 21:23 [Show Content] [Hide Content]From 9e3b82fd9ff412f2c1610fbb9931c6c0ba69cb68 Mon Sep 17 00:00:00 2001
From: unknown <Computer@.(none)>
Date: Wed, 30 Dec 2009 23:21:59 -0600
Subject: [PATCH] Adds llCollisionFilter
---
OpenSim/Region/Framework/Scenes/SceneObjectPart.cs | 334 ++++++++++++++++----
.../Shared/Api/Implementation/LSL_Api.cs | 48 +++-
2 files changed, 315 insertions(+), 67 deletions(-)
diff --git a/OpenSim/Region/Framework/Scenes/SceneObjectPart.cs b/OpenSim/Region/Framework/Scenes/SceneObjectPart.cs
index 6f8aeb0..8c01845 100644
--- a/OpenSim/Region/Framework/Scenes/SceneObjectPart.cs
+++ b/OpenSim/Region/Framework/Scenes/SceneObjectPart.cs
@@ -143,6 +143,9 @@ namespace OpenSim.Region.Framework.Scenes
[XmlIgnore]
public bool RETURN_AT_EDGE;
+
+ [XmlIgnore]
+ public Dictionary<int, string> m_CollisionFilter;
/// <value>
/// The UUID of the user inventory item from which this object was rezzed if this is a root part.
@@ -454,6 +457,15 @@ namespace OpenSim.Region.Framework.Scenes
ParentGroup.HasGroupChanged = true;
}
}
+
+ public Dictionary<int, string> CollisionFilter
+ {
+ get { return m_CollisionFilter; }
+ set
+ {
+ m_CollisionFilter = value;
+ }
+ }
public ulong RegionHandle
{
@@ -1887,20 +1899,52 @@ namespace OpenSim.Region.Framework.Scenes
if (m_parentGroup.Scene == null)
return;
-
+ #region collision Filter
SceneObjectPart obj = m_parentGroup.Scene.GetSceneObjectPart(localId);
if (obj != null)
{
- DetectedObject detobj = new DetectedObject();
- detobj.keyUUID = obj.UUID;
- detobj.nameStr = obj.Name;
- detobj.ownerUUID = obj._ownerID;
- detobj.posVector = obj.AbsolutePosition;
- detobj.rotQuat = obj.GetWorldRotation();
- detobj.velVector = obj.Velocity;
- detobj.colliderType = 0;
- detobj.groupUUID = obj._groupID;
- colliding.Add(detobj);
+ if(m_parentGroup.RootPart.CollisionFilter.ContainsValue(obj.UUID.ToString()) || m_parentGroup.RootPart.CollisionFilter.ContainsValue(obj.Name))
+ {
+ string data = "";
+ m_parentGroup.RootPart.CollisionFilter.TryGetValue(1,out data);
+ //If it is 1, it is to accept ONLY collisions from this object
+ if(data != "")
+ {
+ DetectedObject detobj = new DetectedObject();
+ detobj.keyUUID = obj.UUID;
+ detobj.nameStr = obj.Name;
+ detobj.ownerUUID = obj._ownerID;
+ detobj.posVector = obj.AbsolutePosition;
+ detobj.rotQuat = obj.GetWorldRotation();
+ detobj.velVector = obj.Velocity;
+ detobj.colliderType = 0;
+ detobj.groupUUID = obj._groupID;
+ colliding.Add(detobj);
+ }
+ //If it is 0, it is to not accept collisions from this object
+ else
+ {
+ }
+ }
+ else
+ {
+ string data = "";
+ m_parentGroup.RootPart.CollisionFilter.TryGetValue(1,out data);
+ //If it is 1, it is to accept ONLY collisions from this object, so this other object will not work
+ if(data == "")
+ {
+ DetectedObject detobj = new DetectedObject();
+ detobj.keyUUID = obj.UUID;
+ detobj.nameStr = obj.Name;
+ detobj.ownerUUID = obj._ownerID;
+ detobj.posVector = obj.AbsolutePosition;
+ detobj.rotQuat = obj.GetWorldRotation();
+ detobj.velVector = obj.Velocity;
+ detobj.colliderType = 0;
+ detobj.groupUUID = obj._groupID;
+ colliding.Add(detobj);
+ }
+ }
}
else
{
@@ -1912,19 +1956,52 @@ namespace OpenSim.Region.Framework.Scenes
if (av.LocalId == localId)
{
- DetectedObject detobj = new DetectedObject();
- detobj.keyUUID = av.UUID;
- detobj.nameStr = av.ControllingClient.Name;
- detobj.ownerUUID = av.UUID;
- detobj.posVector = av.AbsolutePosition;
- detobj.rotQuat = av.Rotation;
- detobj.velVector = av.Velocity;
- detobj.colliderType = 0;
- detobj.groupUUID = av.ControllingClient.ActiveGroupId;
- colliding.Add(detobj);
+ if(m_parentGroup.RootPart.CollisionFilter.ContainsValue(obj.UUID.ToString()) || m_parentGroup.RootPart.CollisionFilter.ContainsValue(obj.Name))
+ {
+ string data = "";
+ m_parentGroup.RootPart.CollisionFilter.TryGetValue(1,out data);
+ //If it is 1, it is to accept ONLY collisions from this avatar
+ if(data != "")
+ {
+ DetectedObject detobj = new DetectedObject();
+ detobj.keyUUID = av.UUID;
+ detobj.nameStr = av.ControllingClient.Name;
+ detobj.ownerUUID = av.UUID;
+ detobj.posVector = av.AbsolutePosition;
+ detobj.rotQuat = av.Rotation;
+ detobj.velVector = av.Velocity;
+ detobj.colliderType = 0;
+ detobj.groupUUID = av.ControllingClient.ActiveGroupId;
+ colliding.Add(detobj);
+ }
+ //If it is 0, it is to not accept collisions from this avatar
+ else
+ {
+ }
+ }
+ else
+ {
+ string data = "";
+ m_parentGroup.RootPart.CollisionFilter.TryGetValue(1,out data);
+ //If it is 1, it is to accept ONLY collisions from this avatar, so this other avatar will not work
+ if(data == "")
+ {
+ DetectedObject detobj = new DetectedObject();
+ detobj.keyUUID = av.UUID;
+ detobj.nameStr = av.ControllingClient.Name;
+ detobj.ownerUUID = av.UUID;
+ detobj.posVector = av.AbsolutePosition;
+ detobj.rotQuat = av.Rotation;
+ detobj.velVector = av.Velocity;
+ detobj.colliderType = 0;
+ detobj.groupUUID = av.ControllingClient.ActiveGroupId;
+ colliding.Add(detobj);
+ }
+ }
}
}
}
+ #endregion
}
if (colliding.Count > 0)
{
@@ -1958,41 +2035,105 @@ namespace OpenSim.Region.Framework.Scenes
if (m_parentGroup.Scene == null)
return;
-
+ #region collision Filter
SceneObjectPart obj = m_parentGroup.Scene.GetSceneObjectPart(localId);
if (obj != null)
{
- DetectedObject detobj = new DetectedObject();
- detobj.keyUUID = obj.UUID;
- detobj.nameStr = obj.Name;
- detobj.ownerUUID = obj._ownerID;
- detobj.posVector = obj.AbsolutePosition;
- detobj.rotQuat = obj.GetWorldRotation();
- detobj.velVector = obj.Velocity;
- detobj.colliderType = 0;
- detobj.groupUUID = obj._groupID;
- colliding.Add(detobj);
+ if(m_parentGroup.RootPart.CollisionFilter.ContainsValue(obj.UUID.ToString()) || m_parentGroup.RootPart.CollisionFilter.ContainsValue(obj.Name))
+ {
+ string data = "";
+ m_parentGroup.RootPart.CollisionFilter.TryGetValue(1,out data);
+ //If it is 1, it is to accept ONLY collisions from this object
+ if(data != "")
+ {
+ DetectedObject detobj = new DetectedObject();
+ detobj.keyUUID = obj.UUID;
+ detobj.nameStr = obj.Name;
+ detobj.ownerUUID = obj._ownerID;
+ detobj.posVector = obj.AbsolutePosition;
+ detobj.rotQuat = obj.GetWorldRotation();
+ detobj.velVector = obj.Velocity;
+ detobj.colliderType = 0;
+ detobj.groupUUID = obj._groupID;
+ colliding.Add(detobj);
+ }
+ //If it is 0, it is to not accept collisions from this object
+ else
+ {
+ }
+ }
+ else
+ {
+ string data = "";
+ m_parentGroup.RootPart.CollisionFilter.TryGetValue(1,out data);
+ //If it is 1, it is to accept ONLY collisions from this object, so this other object will not work
+ if(data == "")
+ {
+ DetectedObject detobj = new DetectedObject();
+ detobj.keyUUID = obj.UUID;
+ detobj.nameStr = obj.Name;
+ detobj.ownerUUID = obj._ownerID;
+ detobj.posVector = obj.AbsolutePosition;
+ detobj.rotQuat = obj.GetWorldRotation();
+ detobj.velVector = obj.Velocity;
+ detobj.colliderType = 0;
+ detobj.groupUUID = obj._groupID;
+ colliding.Add(detobj);
+ }
+ }
}
else
{
ScenePresence[] avlist = m_parentGroup.Scene.GetScenePresences();
-
+
for (int i = 0; i < avlist.Length; i++)
{
ScenePresence av = avlist[i];
if (av.LocalId == localId)
{
- DetectedObject detobj = new DetectedObject();
- detobj.keyUUID = av.UUID;
- detobj.nameStr = av.Name;
- detobj.ownerUUID = av.UUID;
- detobj.posVector = av.AbsolutePosition;
- detobj.rotQuat = av.Rotation;
- detobj.velVector = av.Velocity;
- detobj.colliderType = 0;
- detobj.groupUUID = av.ControllingClient.ActiveGroupId;
- colliding.Add(detobj);
+ if(m_parentGroup.RootPart.CollisionFilter.ContainsValue(obj.UUID.ToString()) || m_parentGroup.RootPart.CollisionFilter.ContainsValue(obj.Name))
+ {
+ string data = "";
+ m_parentGroup.RootPart.CollisionFilter.TryGetValue(1,out data);
+ //If it is 1, it is to accept ONLY collisions from this avatar
+ if(data != "")
+ {
+ DetectedObject detobj = new DetectedObject();
+ detobj.keyUUID = av.UUID;
+ detobj.nameStr = av.ControllingClient.Name;
+ detobj.ownerUUID = av.UUID;
+ detobj.posVector = av.AbsolutePosition;
+ detobj.rotQuat = av.Rotation;
+ detobj.velVector = av.Velocity;
+ detobj.colliderType = 0;
+ detobj.groupUUID = av.ControllingClient.ActiveGroupId;
+ colliding.Add(detobj);
+ }
+ //If it is 0, it is to not accept collisions from this avatar
+ else
+ {
+ }
+ }
+ else
+ {
+ string data = "";
+ m_parentGroup.RootPart.CollisionFilter.TryGetValue(1,out data);
+ //If it is 1, it is to accept ONLY collisions from this avatar, so this other avatar will not work
+ if(data == "")
+ {
+ DetectedObject detobj = new DetectedObject();
+ detobj.keyUUID = av.UUID;
+ detobj.nameStr = av.ControllingClient.Name;
+ detobj.ownerUUID = av.UUID;
+ detobj.posVector = av.AbsolutePosition;
+ detobj.rotQuat = av.Rotation;
+ detobj.velVector = av.Velocity;
+ detobj.colliderType = 0;
+ detobj.groupUUID = av.ControllingClient.ActiveGroupId;
+ colliding.Add(detobj);
+ }
+ }
}
}
}
@@ -2010,6 +2151,7 @@ namespace OpenSim.Region.Framework.Scenes
m_parentGroup.Scene.EventManager.TriggerScriptColliding(LocalId, CollidingMessage);
}
}
+ #endregion
}
if ((m_parentGroup.RootPart.ScriptEvents & scriptEvents.collision_end) != 0)
@@ -2028,19 +2170,52 @@ namespace OpenSim.Region.Framework.Scenes
return;
if (m_parentGroup.Scene == null)
return;
+ #region collision Filter
SceneObjectPart obj = m_parentGroup.Scene.GetSceneObjectPart(localId);
if (obj != null)
{
- DetectedObject detobj = new DetectedObject();
- detobj.keyUUID = obj.UUID;
- detobj.nameStr = obj.Name;
- detobj.ownerUUID = obj._ownerID;
- detobj.posVector = obj.AbsolutePosition;
- detobj.rotQuat = obj.GetWorldRotation();
- detobj.velVector = obj.Velocity;
- detobj.colliderType = 0;
- detobj.groupUUID = obj._groupID;
- colliding.Add(detobj);
+ if(m_parentGroup.RootPart.CollisionFilter.ContainsValue(obj.UUID.ToString()) || m_parentGroup.RootPart.CollisionFilter.ContainsValue(obj.Name))
+ {
+ string data = "";
+ m_parentGroup.RootPart.CollisionFilter.TryGetValue(1,out data);
+ //If it is 1, it is to accept ONLY collisions from this object
+ if(data != "")
+ {
+ DetectedObject detobj = new DetectedObject();
+ detobj.keyUUID = obj.UUID;
+ detobj.nameStr = obj.Name;
+ detobj.ownerUUID = obj._ownerID;
+ detobj.posVector = obj.AbsolutePosition;
+ detobj.rotQuat = obj.GetWorldRotation();
+ detobj.velVector = obj.Velocity;
+ detobj.colliderType = 0;
+ detobj.groupUUID = obj._groupID;
+ colliding.Add(detobj);
+ }
+ //If it is 0, it is to not accept collisions from this object
+ else
+ {
+ }
+ }
+ else
+ {
+ string data = "";
+ m_parentGroup.RootPart.CollisionFilter.TryGetValue(1,out data);
+ //If it is 1, it is to accept ONLY collisions from this object, so this other object will not work
+ if(data == "")
+ {
+ DetectedObject detobj = new DetectedObject();
+ detobj.keyUUID = obj.UUID;
+ detobj.nameStr = obj.Name;
+ detobj.ownerUUID = obj._ownerID;
+ detobj.posVector = obj.AbsolutePosition;
+ detobj.rotQuat = obj.GetWorldRotation();
+ detobj.velVector = obj.Velocity;
+ detobj.colliderType = 0;
+ detobj.groupUUID = obj._groupID;
+ colliding.Add(detobj);
+ }
+ }
}
else
{
@@ -2052,19 +2227,52 @@ namespace OpenSim.Region.Framework.Scenes
if (av.LocalId == localId)
{
- DetectedObject detobj = new DetectedObject();
- detobj.keyUUID = av.UUID;
- detobj.nameStr = av.Name;
- detobj.ownerUUID = av.UUID;
- detobj.posVector = av.AbsolutePosition;
- detobj.rotQuat = av.Rotation;
- detobj.velVector = av.Velocity;
- detobj.colliderType = 0;
- detobj.groupUUID = av.ControllingClient.ActiveGroupId;
- colliding.Add(detobj);
+ if(m_parentGroup.RootPart.CollisionFilter.ContainsValue(obj.UUID.ToString()) || m_parentGroup.RootPart.CollisionFilter.ContainsValue(obj.Name))
+ {
+ string data = "";
+ m_parentGroup.RootPart.CollisionFilter.TryGetValue(1,out data);
+ //If it is 1, it is to accept ONLY collisions from this avatar
+ if(data != "")
+ {
+ DetectedObject detobj = new DetectedObject();
+ detobj.keyUUID = av.UUID;
+ detobj.nameStr = av.ControllingClient.Name;
+ detobj.ownerUUID = av.UUID;
+ detobj.posVector = av.AbsolutePosition;
+ detobj.rotQuat = av.Rotation;
+ detobj.velVector = av.Velocity;
+ detobj.colliderType = 0;
+ detobj.groupUUID = av.ControllingClient.ActiveGroupId;
+ colliding.Add(detobj);
+ }
+ //If it is 0, it is to not accept collisions from this avatar
+ else
+ {
+ }
+ }
+ else
+ {
+ string data = "";
+ m_parentGroup.RootPart.CollisionFilter.TryGetValue(1,out data);
+ //If it is 1, it is to accept ONLY collisions from this avatar, so this other avatar will not work
+ if(data == "")
+ {
+ DetectedObject detobj = new DetectedObject();
+ detobj.keyUUID = av.UUID;
+ detobj.nameStr = av.ControllingClient.Name;
+ detobj.ownerUUID = av.UUID;
+ detobj.posVector = av.AbsolutePosition;
+ detobj.rotQuat = av.Rotation;
+ detobj.velVector = av.Velocity;
+ detobj.colliderType = 0;
+ detobj.groupUUID = av.ControllingClient.ActiveGroupId;
+ colliding.Add(detobj);
+ }
+ }
}
}
}
+ #endregion
}
if (colliding.Count > 0)
diff --git a/OpenSim/Region/ScriptEngine/Shared/Api/Implementation/LSL_Api.cs b/OpenSim/Region/ScriptEngine/Shared/Api/Implementation/LSL_Api.cs
index 760dfd4..b3d121a 100644
--- a/OpenSim/Region/ScriptEngine/Shared/Api/Implementation/LSL_Api.cs
+++ b/OpenSim/Region/ScriptEngine/Shared/Api/Implementation/LSL_Api.cs
@@ -2757,7 +2757,15 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api
public void llCollisionFilter(string name, string id, int accept)
{
m_host.AddScriptLPS(1);
- NotImplemented("llCollisionFilter");
+ m_host.CollisionFilter.Clear();
+ if(id != null)
+ {
+ m_host.CollisionFilter.Add(accept,id);
+ }
+ else
+ {
+ m_host.CollisionFilter.Add(accept,name);
+ }
}
public void llTakeControls(int controls, int accept, int pass_on)
@@ -8212,11 +8220,43 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api
return -1;
}
-
+
public void llSetInventoryPermMask(string item, int mask, int value)
{
- m_host.AddScriptLPS(1);
- NotImplemented("llSetInventoryPermMask");
+ m_host.AddScriptLPS(1);
+ if (m_ScriptEngine.Config.GetBoolean("AllowGodFunctions", false))
+ {
+ if (World.Permissions.CanRunConsoleCommand(m_host.OwnerID))
+ {
+ lock (m_host.TaskInventory)
+ {
+ foreach (KeyValuePair<UUID, TaskInventoryItem> inv in m_host.TaskInventory)
+ {
+ if (inv.Value.Name == item)
+ {
+ switch (mask)
+ {
+ case 0:
+ inv.Value.BasePermissions = (uint)value;
+ break;
+ case 1:
+ inv.Value.CurrentPermissions = (uint)value;
+ break;
+ case 2:
+ inv.Value.GroupPermissions = (uint)value;
+ break;
+ case 3:
+ inv.Value.EveryonePermissions = (uint)value;
+ break;
+ case 4:
+ inv.Value.NextPermissions = (uint)value;
+ break;
+ }
+ }
+ }
+ }
+ }
+ }
}
public LSL_String llGetInventoryCreator(string item)
--
1.6.4.msysgit.0
0001-Readds-llCollisionFilter-and-adds-llPassCollision.patch [^] (25,516 bytes) 2009-12-31 09:41 [Show Content] [Hide Content]From e102c43ade9bad61a2664103b87dd9ab7fd040d5 Mon Sep 17 00:00:00 2001
From: unknown <Computer@.(none)>
Date: Thu, 31 Dec 2009 11:41:07 -0600
Subject: [PATCH] Readds llCollisionFilter and adds llPassCollision.
---
.../Region/Framework/Scenes/SceneObjectGroup.cs | 11 +
OpenSim/Region/Framework/Scenes/SceneObjectPart.cs | 327 ++++++++++++++++----
.../Shared/Api/Implementation/LSL_Api.cs | 19 +-
3 files changed, 293 insertions(+), 64 deletions(-)
diff --git a/OpenSim/Region/Framework/Scenes/SceneObjectGroup.cs b/OpenSim/Region/Framework/Scenes/SceneObjectGroup.cs
index e9ed066..34d8b49 100644
--- a/OpenSim/Region/Framework/Scenes/SceneObjectGroup.cs
+++ b/OpenSim/Region/Framework/Scenes/SceneObjectGroup.cs
@@ -340,6 +340,17 @@ namespace OpenSim.Region.Framework.Scenes
{
get { return true; }
}
+
+ private bool m_passCollision;
+ public bool PassCollision
+ {
+ get { return m_passCollision; }
+ set
+ {
+ m_passCollision = value;
+ HasGroupChanged = true;
+ }
+ }
public bool IsSelected
{
diff --git a/OpenSim/Region/Framework/Scenes/SceneObjectPart.cs b/OpenSim/Region/Framework/Scenes/SceneObjectPart.cs
index c0243a5..5d5214b 100644
--- a/OpenSim/Region/Framework/Scenes/SceneObjectPart.cs
+++ b/OpenSim/Region/Framework/Scenes/SceneObjectPart.cs
@@ -140,6 +140,9 @@ namespace OpenSim.Region.Framework.Scenes
[XmlIgnore]
public UUID FromItemID;
+
+ [XmlIgnore]
+ private Dictionary<int, string> m_CollisionFilter = new Dictionary<int, string>();
/// <value>
/// The UUID of the user inventory item from which this object was rezzed if this is a root part.
@@ -452,6 +455,17 @@ namespace OpenSim.Region.Framework.Scenes
}
}
+
+ [XmlIgnore]
+ public Dictionary<int, string> CollisionFilter
+ {
+ get { return m_CollisionFilter; }
+ set
+ {
+ m_CollisionFilter = value;
+ }
+ }
+
public ulong RegionHandle
{
get { return m_regionHandle; }
@@ -1876,18 +1890,49 @@ namespace OpenSim.Region.Framework.Scenes
return;
SceneObjectPart obj = m_parentGroup.Scene.GetSceneObjectPart(localId);
+ string data = "";
if (obj != null)
{
- DetectedObject detobj = new DetectedObject();
- detobj.keyUUID = obj.UUID;
- detobj.nameStr = obj.Name;
- detobj.ownerUUID = obj._ownerID;
- detobj.posVector = obj.AbsolutePosition;
- detobj.rotQuat = obj.GetWorldRotation();
- detobj.velVector = obj.Velocity;
- detobj.colliderType = 0;
- detobj.groupUUID = obj._groupID;
- colliding.Add(detobj);
+ if(m_parentGroup.RootPart.CollisionFilter.ContainsValue(obj.UUID.ToString()) || m_parentGroup.RootPart.CollisionFilter.ContainsValue(obj.Name))
+ {
+ bool found = m_parentGroup.RootPart.CollisionFilter.TryGetValue(1,out data);
+ //If it is 1, it is to accept ONLY collisions from this object
+ if(found)
+ {
+ DetectedObject detobj = new DetectedObject();
+ detobj.keyUUID = obj.UUID;
+ detobj.nameStr = obj.Name;
+ detobj.ownerUUID = obj._ownerID;
+ detobj.posVector = obj.AbsolutePosition;
+ detobj.rotQuat = obj.GetWorldRotation();
+ detobj.velVector = obj.Velocity;
+ detobj.colliderType = 0;
+ detobj.groupUUID = obj._groupID;
+ colliding.Add(detobj);
+ }
+ //If it is 0, it is to not accept collisions from this object
+ else
+ {
+ }
+ }
+ else
+ {
+ bool found = m_parentGroup.RootPart.CollisionFilter.TryGetValue(1,out data);
+ //If it is 1, it is to accept ONLY collisions from this object, so this other object will not work
+ if(found)
+ {
+ DetectedObject detobj = new DetectedObject();
+ detobj.keyUUID = obj.UUID;
+ detobj.nameStr = obj.Name;
+ detobj.ownerUUID = obj._ownerID;
+ detobj.posVector = obj.AbsolutePosition;
+ detobj.rotQuat = obj.GetWorldRotation();
+ detobj.velVector = obj.Velocity;
+ detobj.colliderType = 0;
+ detobj.groupUUID = obj._groupID;
+ colliding.Add(detobj);
+ }
+ }
}
else
{
@@ -1899,16 +1944,47 @@ namespace OpenSim.Region.Framework.Scenes
if (av.LocalId == localId)
{
- DetectedObject detobj = new DetectedObject();
- detobj.keyUUID = av.UUID;
- detobj.nameStr = av.ControllingClient.Name;
- detobj.ownerUUID = av.UUID;
- detobj.posVector = av.AbsolutePosition;
- detobj.rotQuat = av.Rotation;
- detobj.velVector = av.Velocity;
- detobj.colliderType = 0;
- detobj.groupUUID = av.ControllingClient.ActiveGroupId;
- colliding.Add(detobj);
+ if(m_parentGroup.RootPart.CollisionFilter.ContainsValue(obj.UUID.ToString()) || m_parentGroup.RootPart.CollisionFilter.ContainsValue(obj.Name))
+ {
+ bool found = m_parentGroup.RootPart.CollisionFilter.TryGetValue(1,out data);
+ //If it is 1, it is to accept ONLY collisions from this avatar
+ if(found)
+ {
+ DetectedObject detobj = new DetectedObject();
+ detobj.keyUUID = av.UUID;
+ detobj.nameStr = av.ControllingClient.Name;
+ detobj.ownerUUID = av.UUID;
+ detobj.posVector = av.AbsolutePosition;
+ detobj.rotQuat = av.Rotation;
+ detobj.velVector = av.Velocity;
+ detobj.colliderType = 0;
+ detobj.groupUUID = av.ControllingClient.ActiveGroupId;
+ colliding.Add(detobj);
+ }
+ //If it is 0, it is to not accept collisions from this avatar
+ else
+ {
+ }
+ }
+ else
+ {
+ bool found = m_parentGroup.RootPart.CollisionFilter.TryGetValue(1,out data);
+ //If it is 1, it is to accept ONLY collisions from this avatar, so this other avatar will not work
+ if(found)
+ {
+ DetectedObject detobj = new DetectedObject();
+ detobj.keyUUID = av.UUID;
+ detobj.nameStr = av.ControllingClient.Name;
+ detobj.ownerUUID = av.UUID;
+ detobj.posVector = av.AbsolutePosition;
+ detobj.rotQuat = av.Rotation;
+ detobj.velVector = av.Velocity;
+ detobj.colliderType = 0;
+ detobj.groupUUID = av.ControllingClient.ActiveGroupId;
+ colliding.Add(detobj);
+ }
+ }
+
}
}
}
@@ -1922,7 +1998,10 @@ namespace OpenSim.Region.Framework.Scenes
if (m_parentGroup.Scene == null)
return;
-
+ if(m_parentGroup.PassCollision == true)
+ {
+ //TODO: Add pass to root prim!
+ }
m_parentGroup.Scene.EventManager.TriggerScriptCollidingStart(LocalId, StartCollidingMessage);
}
}
@@ -1947,39 +2026,101 @@ namespace OpenSim.Region.Framework.Scenes
return;
SceneObjectPart obj = m_parentGroup.Scene.GetSceneObjectPart(localId);
+ string data = "";
if (obj != null)
{
- DetectedObject detobj = new DetectedObject();
- detobj.keyUUID = obj.UUID;
- detobj.nameStr = obj.Name;
- detobj.ownerUUID = obj._ownerID;
- detobj.posVector = obj.AbsolutePosition;
- detobj.rotQuat = obj.GetWorldRotation();
- detobj.velVector = obj.Velocity;
- detobj.colliderType = 0;
- detobj.groupUUID = obj._groupID;
- colliding.Add(detobj);
+ if(m_parentGroup.RootPart.CollisionFilter.ContainsValue(obj.UUID.ToString()) || m_parentGroup.RootPart.CollisionFilter.ContainsValue(obj.Name))
+ {
+ bool found = m_parentGroup.RootPart.CollisionFilter.TryGetValue(1,out data);
+ //If it is 1, it is to accept ONLY collisions from this object
+ if(found)
+ {
+ DetectedObject detobj = new DetectedObject();
+ detobj.keyUUID = obj.UUID;
+ detobj.nameStr = obj.Name;
+ detobj.ownerUUID = obj._ownerID;
+ detobj.posVector = obj.AbsolutePosition;
+ detobj.rotQuat = obj.GetWorldRotation();
+ detobj.velVector = obj.Velocity;
+ detobj.colliderType = 0;
+ detobj.groupUUID = obj._groupID;
+ colliding.Add(detobj);
+ }
+ //If it is 0, it is to not accept collisions from this object
+ else
+ {
+ }
+ }
+ else
+ {
+ bool found = m_parentGroup.RootPart.CollisionFilter.TryGetValue(1,out data);
+ //If it is 1, it is to accept ONLY collisions from this object, so this other object will not work
+ if(found)
+ {
+ DetectedObject detobj = new DetectedObject();
+ detobj.keyUUID = obj.UUID;
+ detobj.nameStr = obj.Name;
+ detobj.ownerUUID = obj._ownerID;
+ detobj.posVector = obj.AbsolutePosition;
+ detobj.rotQuat = obj.GetWorldRotation();
+ detobj.velVector = obj.Velocity;
+ detobj.colliderType = 0;
+ detobj.groupUUID = obj._groupID;
+ colliding.Add(detobj);
+ }
+ }
}
else
{
ScenePresence[] avlist = m_parentGroup.Scene.GetScenePresences();
-
+
for (int i = 0; i < avlist.Length; i++)
{
ScenePresence av = avlist[i];
if (av.LocalId == localId)
{
- DetectedObject detobj = new DetectedObject();
- detobj.keyUUID = av.UUID;
- detobj.nameStr = av.Name;
- detobj.ownerUUID = av.UUID;
- detobj.posVector = av.AbsolutePosition;
- detobj.rotQuat = av.Rotation;
- detobj.velVector = av.Velocity;
- detobj.colliderType = 0;
- detobj.groupUUID = av.ControllingClient.ActiveGroupId;
- colliding.Add(detobj);
+ if(m_parentGroup.RootPart.CollisionFilter.ContainsValue(obj.UUID.ToString()) || m_parentGroup.RootPart.CollisionFilter.ContainsValue(obj.Name))
+ {
+ bool found = m_parentGroup.RootPart.CollisionFilter.TryGetValue(1,out data);
+ //If it is 1, it is to accept ONLY collisions from this avatar
+ if(found)
+ {
+ DetectedObject detobj = new DetectedObject();
+ detobj.keyUUID = av.UUID;
+ detobj.nameStr = av.ControllingClient.Name;
+ detobj.ownerUUID = av.UUID;
+ detobj.posVector = av.AbsolutePosition;
+ detobj.rotQuat = av.Rotation;
+ detobj.velVector = av.Velocity;
+ detobj.colliderType = 0;
+ detobj.groupUUID = av.ControllingClient.ActiveGroupId;
+ colliding.Add(detobj);
+ }
+ //If it is 0, it is to not accept collisions from this avatar
+ else
+ {
+ }
+ }
+ else
+ {
+ bool found = m_parentGroup.RootPart.CollisionFilter.TryGetValue(1,out data);
+ //If it is 1, it is to accept ONLY collisions from this avatar, so this other avatar will not work
+ if(found)
+ {
+ DetectedObject detobj = new DetectedObject();
+ detobj.keyUUID = av.UUID;
+ detobj.nameStr = av.ControllingClient.Name;
+ detobj.ownerUUID = av.UUID;
+ detobj.posVector = av.AbsolutePosition;
+ detobj.rotQuat = av.Rotation;
+ detobj.velVector = av.Velocity;
+ detobj.colliderType = 0;
+ detobj.groupUUID = av.ControllingClient.ActiveGroupId;
+ colliding.Add(detobj);
+ }
+ }
+
}
}
}
@@ -2016,18 +2157,49 @@ namespace OpenSim.Region.Framework.Scenes
if (m_parentGroup.Scene == null)
return;
SceneObjectPart obj = m_parentGroup.Scene.GetSceneObjectPart(localId);
+ string data = "";
if (obj != null)
{
- DetectedObject detobj = new DetectedObject();
- detobj.keyUUID = obj.UUID;
- detobj.nameStr = obj.Name;
- detobj.ownerUUID = obj._ownerID;
- detobj.posVector = obj.AbsolutePosition;
- detobj.rotQuat = obj.GetWorldRotation();
- detobj.velVector = obj.Velocity;
- detobj.colliderType = 0;
- detobj.groupUUID = obj._groupID;
- colliding.Add(detobj);
+ if(m_parentGroup.RootPart.CollisionFilter.ContainsValue(obj.UUID.ToString()) || m_parentGroup.RootPart.CollisionFilter.ContainsValue(obj.Name))
+ {
+ bool found = m_parentGroup.RootPart.CollisionFilter.TryGetValue(1,out data);
+ //If it is 1, it is to accept ONLY collisions from this object
+ if(found)
+ {
+ DetectedObject detobj = new DetectedObject();
+ detobj.keyUUID = obj.UUID;
+ detobj.nameStr = obj.Name;
+ detobj.ownerUUID = obj._ownerID;
+ detobj.posVector = obj.AbsolutePosition;
+ detobj.rotQuat = obj.GetWorldRotation();
+ detobj.velVector = obj.Velocity;
+ detobj.colliderType = 0;
+ detobj.groupUUID = obj._groupID;
+ colliding.Add(detobj);
+ }
+ //If it is 0, it is to not accept collisions from this object
+ else
+ {
+ }
+ }
+ else
+ {
+ bool found = m_parentGroup.RootPart.CollisionFilter.TryGetValue(1,out data);
+ //If it is 1, it is to accept ONLY collisions from this object, so this other object will not work
+ if(found)
+ {
+ DetectedObject detobj = new DetectedObject();
+ detobj.keyUUID = obj.UUID;
+ detobj.nameStr = obj.Name;
+ detobj.ownerUUID = obj._ownerID;
+ detobj.posVector = obj.AbsolutePosition;
+ detobj.rotQuat = obj.GetWorldRotation();
+ detobj.velVector = obj.Velocity;
+ detobj.colliderType = 0;
+ detobj.groupUUID = obj._groupID;
+ colliding.Add(detobj);
+ }
+ }
}
else
{
@@ -2039,16 +2211,47 @@ namespace OpenSim.Region.Framework.Scenes
if (av.LocalId == localId)
{
- DetectedObject detobj = new DetectedObject();
- detobj.keyUUID = av.UUID;
- detobj.nameStr = av.Name;
- detobj.ownerUUID = av.UUID;
- detobj.posVector = av.AbsolutePosition;
- detobj.rotQuat = av.Rotation;
- detobj.velVector = av.Velocity;
- detobj.colliderType = 0;
- detobj.groupUUID = av.ControllingClient.ActiveGroupId;
- colliding.Add(detobj);
+ if(m_parentGroup.RootPart.CollisionFilter.ContainsValue(obj.UUID.ToString()) || m_parentGroup.RootPart.CollisionFilter.ContainsValue(obj.Name))
+ {
+ bool found = m_parentGroup.RootPart.CollisionFilter.TryGetValue(1,out data);
+ //If it is 1, it is to accept ONLY collisions from this avatar
+ if(found)
+ {
+ DetectedObject detobj = new DetectedObject();
+ detobj.keyUUID = av.UUID;
+ detobj.nameStr = av.ControllingClient.Name;
+ detobj.ownerUUID = av.UUID;
+ detobj.posVector = av.AbsolutePosition;
+ detobj.rotQuat = av.Rotation;
+ detobj.velVector = av.Velocity;
+ detobj.colliderType = 0;
+ detobj.groupUUID = av.ControllingClient.ActiveGroupId;
+ colliding.Add(detobj);
+ }
+ //If it is 0, it is to not accept collisions from this avatar
+ else
+ {
+ }
+ }
+ else
+ {
+ bool found = m_parentGroup.RootPart.CollisionFilter.TryGetValue(1,out data);
+ //If it is 1, it is to accept ONLY collisions from this avatar, so this other avatar will not work
+ if(found)
+ {
+ DetectedObject detobj = new DetectedObject();
+ detobj.keyUUID = av.UUID;
+ detobj.nameStr = av.ControllingClient.Name;
+ detobj.ownerUUID = av.UUID;
+ detobj.posVector = av.AbsolutePosition;
+ detobj.rotQuat = av.Rotation;
+ detobj.velVector = av.Velocity;
+ detobj.colliderType = 0;
+ detobj.groupUUID = av.ControllingClient.ActiveGroupId;
+ colliding.Add(detobj);
+ }
+ }
+
}
}
}
diff --git a/OpenSim/Region/ScriptEngine/Shared/Api/Implementation/LSL_Api.cs b/OpenSim/Region/ScriptEngine/Shared/Api/Implementation/LSL_Api.cs
index 6102504..ad2147e 100644
--- a/OpenSim/Region/ScriptEngine/Shared/Api/Implementation/LSL_Api.cs
+++ b/OpenSim/Region/ScriptEngine/Shared/Api/Implementation/LSL_Api.cs
@@ -2752,7 +2752,15 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api
public void llCollisionFilter(string name, string id, int accept)
{
m_host.AddScriptLPS(1);
- NotImplemented("llCollisionFilter");
+ m_host.CollisionFilter.Clear();
+ if(id != null)
+ {
+ m_host.CollisionFilter.Add(accept,id);
+ }
+ else
+ {
+ m_host.CollisionFilter.Add(accept,name);
+ }
}
public void llTakeControls(int controls, int accept, int pass_on)
@@ -4232,7 +4240,14 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api
public void llPassCollisions(int pass)
{
m_host.AddScriptLPS(1);
- NotImplemented("llPassCollisions");
+ if(pass == 0)
+ {
+ m_host.ParentGroup.PassCollision = false;
+ }
+ else
+ {
+ m_host.ParentGroup.PassCollision = true;
+ }
}
public LSL_String llGetScriptName()
--
1.6.4.msysgit.0
| ||||||||
 Relationships |
||||||
|
||||||
 Relationships |
|
Notes |
|
|
(0014615) melanie (administrator) 2009-12-30 21:29 |
This patch also contained llSetInventoryPermsMask, a god function that was not previously implemented. In the future, please don't sneak in unrelated code. Committed with minor changes necessitated by my rejection of the RETURN_AT_EDGE patch. |
|
(0014616) Revolution (reporter) 2009-12-30 22:07 |
Sorry, was going to submit a patch for all the god ones at once, but I forgot to take that one out of this patch. It won't happen again. |
|
(0014617) melanie (administrator) 2009-12-30 22:14 |
You can resubmit the other 2 patches. They weren't unacceptable because of content. They were just filled with ANSI color code garbage. |
|
(0014618) melanie (administrator) 2009-12-30 23:28 |
Had to revert this patch. It caused deserialization errors loading prims from database or rezzing from inventory. |
|
(0014621) Revolution (reporter) 2009-12-31 09:42 |
The new patch fixes the serialization errors and also adds llPassCollision. |
|
(0014622) nebadon (administrator) 2009-12-31 10:46 |
very cool Revolution, any chance you might take a stab at some of the missing LSL events? land_collison, land_collision_start, land_collision_end.. I am really dieing to get these events i need them to finish my Racer project, thanks for attempting to get these last few functions finished :) |
|
(0014623) Revolution (reporter) 2009-12-31 10:55 |
I'm working on it. Hoping to get alot of the rest of LSL stuff done before .6.9. |
|
Notes |
|
Issue History |
|||
| Date Modified | Username | Field | Change |
| 2009-12-30 21:23 | Revolution | New Issue | |
| 2009-12-30 21:23 | Revolution | File Added: 0001-Adds-llCollisionFilter.patch | |
| 2009-12-30 21:23 | Revolution | Git Revision | => master as of 12-30-09 |
| 2009-12-30 21:23 | Revolution | SVN Revision | => 0 |
| 2009-12-30 21:23 | Revolution | Run Mode | => Standalone (Multiple Regions) |
| 2009-12-30 21:23 | Revolution | Physics Engine | => ODE |
| 2009-12-30 21:23 | Revolution | Environment | => .NET / Windows32 |
| 2009-12-30 21:23 | Revolution | Mono Version | => None |
| 2009-12-30 21:24 | Revolution | Status | new => patch included |
| 2009-12-30 21:29 | melanie | Status | patch included => resolved |
| 2009-12-30 21:29 | melanie | Resolution | open => fixed |
| 2009-12-30 21:29 | melanie | Assigned To | => melanie |
| 2009-12-30 21:29 | melanie | Note Added: 0014615 | |
| 2009-12-30 22:07 | Revolution | Status | resolved => feedback |
| 2009-12-30 22:07 | Revolution | Resolution | fixed => reopened |
| 2009-12-30 22:07 | Revolution | Note Added: 0014616 | |
| 2009-12-30 22:08 | Revolution | Status | feedback => resolved |
| 2009-12-30 22:08 | Revolution | Resolution | reopened => fixed |
| 2009-12-30 22:14 | melanie | Note Added: 0014617 | |
| 2009-12-30 23:28 | melanie | Note Added: 0014618 | |
| 2009-12-30 23:28 | melanie | Status | resolved => patch feedback |
| 2009-12-31 09:41 | Revolution | File Added: 0001-Readds-llCollisionFilter-and-adds-llPassCollision.patch | |
| 2009-12-31 09:42 | Revolution | Note Added: 0014621 | |
| 2009-12-31 10:46 | nebadon | Note Added: 0014622 | |
| 2009-12-31 10:55 | Revolution | Note Added: 0014623 | |
| 2009-12-31 14:22 | melanie | Status | patch feedback => resolved |
| 2010-02-15 18:50 | chi11ken | Status | resolved => closed |
| 2018-01-26 02:00 | djphil | Relationship added | related to 0007941 |
|
Issue History |
| Copyright © 2000 - 2012 MantisBT Group |
 |