diff options
author | Melanie | 2012-10-18 21:23:57 +0100 |
---|---|---|
committer | Melanie | 2012-10-18 21:23:57 +0100 |
commit | a2c93133be90822076e4e8d0b4096a83a30d80bd (patch) | |
tree | f7f2da2dacac50411e448245aea7a7f006c1cf96 /OpenSim | |
parent | extend coment to include all unused SOG CheckSculptAndLoad() (diff) | |
download | opensim-SC_OLD-a2c93133be90822076e4e8d0b4096a83a30d80bd.zip opensim-SC_OLD-a2c93133be90822076e4e8d0b4096a83a30d80bd.tar.gz opensim-SC_OLD-a2c93133be90822076e4e8d0b4096a83a30d80bd.tar.bz2 opensim-SC_OLD-a2c93133be90822076e4e8d0b4096a83a30d80bd.tar.xz |
Remove extraneous calls to the now commented CheckSculptAndLoad
Diffstat (limited to 'OpenSim')
-rw-r--r-- | OpenSim/Region/Framework/Scenes/SceneObjectPart.cs | 24 |
1 files changed, 0 insertions, 24 deletions
diff --git a/OpenSim/Region/Framework/Scenes/SceneObjectPart.cs b/OpenSim/Region/Framework/Scenes/SceneObjectPart.cs index 58ef9f7..da2c069 100644 --- a/OpenSim/Region/Framework/Scenes/SceneObjectPart.cs +++ b/OpenSim/Region/Framework/Scenes/SceneObjectPart.cs | |||
@@ -4028,14 +4028,6 @@ namespace OpenSim.Region.Framework.Scenes | |||
4028 | if (!wasUsingPhysics) | 4028 | if (!wasUsingPhysics) |
4029 | { | 4029 | { |
4030 | DoPhysicsPropertyUpdate(UsePhysics, false); | 4030 | DoPhysicsPropertyUpdate(UsePhysics, false); |
4031 | |||
4032 | if (!ParentGroup.IsDeleted) | ||
4033 | { | ||
4034 | if (LocalId == ParentGroup.RootPart.LocalId) | ||
4035 | { | ||
4036 | ParentGroup.CheckSculptAndLoad(); | ||
4037 | } | ||
4038 | } | ||
4039 | } | 4031 | } |
4040 | } | 4032 | } |
4041 | else | 4033 | else |
@@ -4075,14 +4067,6 @@ namespace OpenSim.Region.Framework.Scenes | |||
4075 | pa.SetMaterial(Material); | 4067 | pa.SetMaterial(Material); |
4076 | DoPhysicsPropertyUpdate(UsePhysics, true); | 4068 | DoPhysicsPropertyUpdate(UsePhysics, true); |
4077 | 4069 | ||
4078 | if (!ParentGroup.IsDeleted) | ||
4079 | { | ||
4080 | if (LocalId == ParentGroup.RootPart.LocalId) | ||
4081 | { | ||
4082 | ParentGroup.CheckSculptAndLoad(); | ||
4083 | } | ||
4084 | } | ||
4085 | |||
4086 | if ( | 4070 | if ( |
4087 | ((AggregateScriptEvents & scriptEvents.collision) != 0) || | 4071 | ((AggregateScriptEvents & scriptEvents.collision) != 0) || |
4088 | ((AggregateScriptEvents & scriptEvents.collision_end) != 0) || | 4072 | ((AggregateScriptEvents & scriptEvents.collision_end) != 0) || |
@@ -4107,14 +4091,6 @@ namespace OpenSim.Region.Framework.Scenes | |||
4107 | else // it already has a physical representation | 4091 | else // it already has a physical representation |
4108 | { | 4092 | { |
4109 | DoPhysicsPropertyUpdate(UsePhysics, false); // Update physical status. If it's phantom this will remove the prim | 4093 | DoPhysicsPropertyUpdate(UsePhysics, false); // Update physical status. If it's phantom this will remove the prim |
4110 | |||
4111 | if (!ParentGroup.IsDeleted) | ||
4112 | { | ||
4113 | if (LocalId == ParentGroup.RootPart.LocalId) | ||
4114 | { | ||
4115 | ParentGroup.CheckSculptAndLoad(); | ||
4116 | } | ||
4117 | } | ||
4118 | } | 4094 | } |
4119 | } | 4095 | } |
4120 | 4096 | ||