aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Region/Framework/Scenes/SceneObjectPart.cs
diff options
context:
space:
mode:
authorubit2012-10-04 00:17:19 +0200
committerubit2012-10-04 00:17:19 +0200
commitd657c48abf98de11be56942617abf6ab7ca08852 (patch)
tree81c1e097edd8ded91de89cd6119a5cc724517b95 /OpenSim/Region/Framework/Scenes/SceneObjectPart.cs
parentMerge branch 'ubitwork' of ssh://3dhosting.de/var/git/careminster into ubitwork (diff)
parentmeshworker basic replacement of SOP CheckSculptAndLoad ( for now disabled (diff)
downloadopensim-SC-d657c48abf98de11be56942617abf6ab7ca08852.zip
opensim-SC-d657c48abf98de11be56942617abf6ab7ca08852.tar.gz
opensim-SC-d657c48abf98de11be56942617abf6ab7ca08852.tar.bz2
opensim-SC-d657c48abf98de11be56942617abf6ab7ca08852.tar.xz
Merge branch 'ubitwork' of ssh://3dhosting.de/var/git/careminster into ubitwork
Diffstat (limited to 'OpenSim/Region/Framework/Scenes/SceneObjectPart.cs')
-rw-r--r--OpenSim/Region/Framework/Scenes/SceneObjectPart.cs2
1 files changed, 2 insertions, 0 deletions
diff --git a/OpenSim/Region/Framework/Scenes/SceneObjectPart.cs b/OpenSim/Region/Framework/Scenes/SceneObjectPart.cs
index e6ad89c..1bddf22 100644
--- a/OpenSim/Region/Framework/Scenes/SceneObjectPart.cs
+++ b/OpenSim/Region/Framework/Scenes/SceneObjectPart.cs
@@ -4902,6 +4902,8 @@ namespace OpenSim.Region.Framework.Scenes
4902 { 4902 {
4903// m_log.DebugFormat("Processing CheckSculptAndLoad for {0} {1}", Name, LocalId); 4903// m_log.DebugFormat("Processing CheckSculptAndLoad for {0} {1}", Name, LocalId);
4904 4904
4905 return;
4906
4905 if (ParentGroup.IsDeleted) 4907 if (ParentGroup.IsDeleted)
4906 return; 4908 return;
4907 4909