diff options
author | Justin Clark-Casey (justincc) | 2011-08-06 00:13:08 +0100 |
---|---|---|
committer | Justin Clark-Casey (justincc) | 2011-08-06 00:13:08 +0100 |
commit | c6c91e6599de6d4402ec0258da03cc975147da90 (patch) | |
tree | a42303f745eff34a65f3a33f94d098209c74b923 /OpenSim/Region/Framework | |
parent | Add regression test for setting phantom status on a scene object. This is no... (diff) | |
download | opensim-SC-c6c91e6599de6d4402ec0258da03cc975147da90.zip opensim-SC-c6c91e6599de6d4402ec0258da03cc975147da90.tar.gz opensim-SC-c6c91e6599de6d4402ec0258da03cc975147da90.tar.bz2 opensim-SC-c6c91e6599de6d4402ec0258da03cc975147da90.tar.xz |
refactor: Fold most SOP.ScriptSet* methods back into script code. Simplify.
Diffstat (limited to 'OpenSim/Region/Framework')
-rw-r--r-- | OpenSim/Region/Framework/Scenes/SceneObjectPart.cs | 25 | ||||
-rw-r--r-- | OpenSim/Region/Framework/Scenes/Tests/SceneObjectStatusTests.cs | 4 |
2 files changed, 2 insertions, 27 deletions
diff --git a/OpenSim/Region/Framework/Scenes/SceneObjectPart.cs b/OpenSim/Region/Framework/Scenes/SceneObjectPart.cs index e8a1070..afc386e 100644 --- a/OpenSim/Region/Framework/Scenes/SceneObjectPart.cs +++ b/OpenSim/Region/Framework/Scenes/SceneObjectPart.cs | |||
@@ -2967,22 +2967,6 @@ namespace OpenSim.Region.Framework.Scenes | |||
2967 | } | 2967 | } |
2968 | } | 2968 | } |
2969 | 2969 | ||
2970 | public void ScriptSetPhantomStatus(bool Phantom) | ||
2971 | { | ||
2972 | if (m_parentGroup != null) | ||
2973 | { | ||
2974 | m_parentGroup.ScriptSetPhantomStatus(Phantom); | ||
2975 | } | ||
2976 | } | ||
2977 | |||
2978 | public void ScriptSetTemporaryStatus(bool Temporary) | ||
2979 | { | ||
2980 | if (m_parentGroup != null) | ||
2981 | { | ||
2982 | m_parentGroup.ScriptSetTemporaryStatus(Temporary); | ||
2983 | } | ||
2984 | } | ||
2985 | |||
2986 | public void ScriptSetPhysicsStatus(bool UsePhysics) | 2970 | public void ScriptSetPhysicsStatus(bool UsePhysics) |
2987 | { | 2971 | { |
2988 | if (m_parentGroup == null) | 2972 | if (m_parentGroup == null) |
@@ -2991,15 +2975,6 @@ namespace OpenSim.Region.Framework.Scenes | |||
2991 | m_parentGroup.ScriptSetPhysicsStatus(UsePhysics); | 2975 | m_parentGroup.ScriptSetPhysicsStatus(UsePhysics); |
2992 | } | 2976 | } |
2993 | 2977 | ||
2994 | public void ScriptSetVolumeDetect(bool SetVD) | ||
2995 | { | ||
2996 | |||
2997 | if (m_parentGroup != null) | ||
2998 | { | ||
2999 | m_parentGroup.ScriptSetVolumeDetect(SetVD); | ||
3000 | } | ||
3001 | } | ||
3002 | |||
3003 | /// <summary> | 2978 | /// <summary> |
3004 | /// Set sculpt and mesh data, and tell the physics engine to process the change. | 2979 | /// Set sculpt and mesh data, and tell the physics engine to process the change. |
3005 | /// </summary> | 2980 | /// </summary> |
diff --git a/OpenSim/Region/Framework/Scenes/Tests/SceneObjectStatusTests.cs b/OpenSim/Region/Framework/Scenes/Tests/SceneObjectStatusTests.cs index a26fe33..641c34e 100644 --- a/OpenSim/Region/Framework/Scenes/Tests/SceneObjectStatusTests.cs +++ b/OpenSim/Region/Framework/Scenes/Tests/SceneObjectStatusTests.cs | |||
@@ -53,9 +53,9 @@ namespace OpenSim.Region.Framework.Scenes.Tests | |||
53 | SceneObjectPart rootPart = so.RootPart; | 53 | SceneObjectPart rootPart = so.RootPart; |
54 | Assert.That(rootPart.Flags, Is.EqualTo(PrimFlags.None)); | 54 | Assert.That(rootPart.Flags, Is.EqualTo(PrimFlags.None)); |
55 | 55 | ||
56 | so.RootPart.ScriptSetPhantomStatus(true); | 56 | so.ScriptSetPhantomStatus(true); |
57 | 57 | ||
58 | Console.WriteLine("so.RootPart.Flags [{0}]", so.RootPart.Flags); | 58 | // Console.WriteLine("so.RootPart.Flags [{0}]", so.RootPart.Flags); |
59 | Assert.That(rootPart.Flags, Is.EqualTo(PrimFlags.Phantom)); | 59 | Assert.That(rootPart.Flags, Is.EqualTo(PrimFlags.Phantom)); |
60 | } | 60 | } |
61 | } | 61 | } |