diff options
author | BlueWall | 2012-10-20 05:25:58 -0400 |
---|---|---|
committer | BlueWall | 2012-10-20 05:25:58 -0400 |
commit | 07f1d44174f5e2b4e3d5ffdec3619bb84f357af2 (patch) | |
tree | 83cc0442b2c1b89a5b3dd94cff23d5098415777e /OpenSim/Region/Framework/Scenes/SceneObjectGroup.cs | |
parent | Merge branch 'master' into connector_plugin (diff) | |
parent | Fix: invinite loading for Viewer3 : parcelinfo request of traffic-value (impl... (diff) | |
download | opensim-SC-07f1d44174f5e2b4e3d5ffdec3619bb84f357af2.zip opensim-SC-07f1d44174f5e2b4e3d5ffdec3619bb84f357af2.tar.gz opensim-SC-07f1d44174f5e2b4e3d5ffdec3619bb84f357af2.tar.bz2 opensim-SC-07f1d44174f5e2b4e3d5ffdec3619bb84f357af2.tar.xz |
Merge branch 'master' into connector_plugin
Diffstat (limited to 'OpenSim/Region/Framework/Scenes/SceneObjectGroup.cs')
-rw-r--r-- | OpenSim/Region/Framework/Scenes/SceneObjectGroup.cs | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/OpenSim/Region/Framework/Scenes/SceneObjectGroup.cs b/OpenSim/Region/Framework/Scenes/SceneObjectGroup.cs index 45bbbda..1fa6a75 100644 --- a/OpenSim/Region/Framework/Scenes/SceneObjectGroup.cs +++ b/OpenSim/Region/Framework/Scenes/SceneObjectGroup.cs | |||
@@ -3432,6 +3432,7 @@ namespace OpenSim.Region.Framework.Scenes | |||
3432 | /// <remarks> | 3432 | /// <remarks> |
3433 | /// When the physics engine has finished with it, the sculpt data is discarded to save memory. | 3433 | /// When the physics engine has finished with it, the sculpt data is discarded to save memory. |
3434 | /// </remarks> | 3434 | /// </remarks> |
3435 | /* | ||
3435 | public void CheckSculptAndLoad() | 3436 | public void CheckSculptAndLoad() |
3436 | { | 3437 | { |
3437 | if (IsDeleted) | 3438 | if (IsDeleted) |
@@ -3447,7 +3448,7 @@ namespace OpenSim.Region.Framework.Scenes | |||
3447 | for (int i = 0; i < parts.Length; i++) | 3448 | for (int i = 0; i < parts.Length; i++) |
3448 | parts[i].CheckSculptAndLoad(); | 3449 | parts[i].CheckSculptAndLoad(); |
3449 | } | 3450 | } |
3450 | 3451 | */ | |
3451 | /// <summary> | 3452 | /// <summary> |
3452 | /// Set the user group to which this scene object belongs. | 3453 | /// Set the user group to which this scene object belongs. |
3453 | /// </summary> | 3454 | /// </summary> |