diff options
| author | Justin Clark-Casey (justincc) | 2012-10-18 23:32:40 +0100 |
|---|---|---|
| committer | Justin Clark-Casey (justincc) | 2012-10-18 23:32:40 +0100 |
| commit | 8aa43e72e53cf57047be979499b31c2a970b0324 (patch) | |
| tree | 3f467214f8e2d77b57d258a3bc3571cc8d2648ff /OpenSim/Region/Framework/Scenes/SceneObjectGroup.cs | |
| parent | Add number of inventory items to information displayed via "show part" consol... (diff) | |
| parent | Remove extraneous calls to the now commented CheckSculptAndLoad (diff) | |
| download | opensim-SC_OLD-8aa43e72e53cf57047be979499b31c2a970b0324.zip opensim-SC_OLD-8aa43e72e53cf57047be979499b31c2a970b0324.tar.gz opensim-SC_OLD-8aa43e72e53cf57047be979499b31c2a970b0324.tar.bz2 opensim-SC_OLD-8aa43e72e53cf57047be979499b31c2a970b0324.tar.xz | |
Merge branch 'master' of ssh://opensimulator.org/var/git/opensim
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> |