aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Region/Environment/Scenes/SceneObjectPart.cs
diff options
context:
space:
mode:
authorMW2007-08-23 11:18:16 +0000
committerMW2007-08-23 11:18:16 +0000
commit8264ba849f24ed201bfe38e651932cc80fd9d3dc (patch)
tree3693b83e5b6faaef762e03be9c988488737f7173 /OpenSim/Region/Environment/Scenes/SceneObjectPart.cs
parentAdded danx0r's physics patch, although for now have disabled the lines in Sce... (diff)
downloadopensim-SC-8264ba849f24ed201bfe38e651932cc80fd9d3dc.zip
opensim-SC-8264ba849f24ed201bfe38e651932cc80fd9d3dc.tar.gz
opensim-SC-8264ba849f24ed201bfe38e651932cc80fd9d3dc.tar.bz2
opensim-SC-8264ba849f24ed201bfe38e651932cc80fd9d3dc.tar.xz
Added a PhysicsActor PhysActor member to SceneObjectPart, and made it so this is set when registering the prims with the physics engine.
Position changes of the prim is now updated straight away to physic engine. (note at the moment, only root prim is registered with physics engine. Think we need to decide how we are going to manage child prims and physics.) As before this is all currently disabled (in scene.cs) until its in a bit more working condition.
Diffstat (limited to 'OpenSim/Region/Environment/Scenes/SceneObjectPart.cs')
-rw-r--r--OpenSim/Region/Environment/Scenes/SceneObjectPart.cs3
1 files changed, 3 insertions, 0 deletions
diff --git a/OpenSim/Region/Environment/Scenes/SceneObjectPart.cs b/OpenSim/Region/Environment/Scenes/SceneObjectPart.cs
index 567681a..eea2d72 100644
--- a/OpenSim/Region/Environment/Scenes/SceneObjectPart.cs
+++ b/OpenSim/Region/Environment/Scenes/SceneObjectPart.cs
@@ -11,6 +11,7 @@ using OpenSim.Framework.Interfaces;
11using OpenSim.Framework.Types; 11using OpenSim.Framework.Types;
12using OpenSim.Region.Environment.Scenes.Scripting; 12using OpenSim.Region.Environment.Scenes.Scripting;
13using OpenSim.Framework.Utilities; 13using OpenSim.Framework.Utilities;
14using OpenSim.Physics.Manager;
14 15
15namespace OpenSim.Region.Environment.Scenes 16namespace OpenSim.Region.Environment.Scenes
16{ 17{
@@ -22,6 +23,8 @@ namespace OpenSim.Region.Environment.Scenes
22 private string m_inventoryFileName = ""; 23 private string m_inventoryFileName = "";
23 private LLUUID m_folderID = LLUUID.Zero; 24 private LLUUID m_folderID = LLUUID.Zero;
24 25
26 public PhysicsActor PhysActor = null;
27
25 protected Dictionary<LLUUID, TaskInventoryItem> TaskInventory = new Dictionary<LLUUID, TaskInventoryItem>(); 28 protected Dictionary<LLUUID, TaskInventoryItem> TaskInventory = new Dictionary<LLUUID, TaskInventoryItem>();
26 29
27 public LLUUID CreatorID; 30 public LLUUID CreatorID;