diff options
| author | Melanie | 2012-10-19 00:12:30 +0200 |
|---|---|---|
| committer | Melanie | 2012-10-19 00:12:30 +0200 |
| commit | 8ce7ab721da4cd26f1e598957cbf91ca4375949c (patch) | |
| tree | b3fce93d1c3c1339f0248fa35f3a5ddbd695f68f /OpenSim/Region/Framework | |
| parent | Remove redundant and annoyingly modal message box in upload processing. (diff) | |
| parent | [UNTESTED] core Ode: stop trying to load a broken asset. Make broken (diff) | |
| download | opensim-SC-8ce7ab721da4cd26f1e598957cbf91ca4375949c.zip opensim-SC-8ce7ab721da4cd26f1e598957cbf91ca4375949c.tar.gz opensim-SC-8ce7ab721da4cd26f1e598957cbf91ca4375949c.tar.bz2 opensim-SC-8ce7ab721da4cd26f1e598957cbf91ca4375949c.tar.xz | |
Merge branch 'ubitwork' into avination
Diffstat (limited to '')
| -rw-r--r-- | OpenSim/Region/Framework/Scenes/SceneObjectGroup.cs | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/OpenSim/Region/Framework/Scenes/SceneObjectGroup.cs b/OpenSim/Region/Framework/Scenes/SceneObjectGroup.cs index 5bd0a1b..b12d0e0 100644 --- a/OpenSim/Region/Framework/Scenes/SceneObjectGroup.cs +++ b/OpenSim/Region/Framework/Scenes/SceneObjectGroup.cs | |||
| @@ -4302,6 +4302,7 @@ namespace OpenSim.Region.Framework.Scenes | |||
| 4302 | /// <remarks> | 4302 | /// <remarks> |
| 4303 | /// When the physics engine has finished with it, the sculpt data is discarded to save memory. | 4303 | /// When the physics engine has finished with it, the sculpt data is discarded to save memory. |
| 4304 | /// </remarks> | 4304 | /// </remarks> |
| 4305 | /* | ||
| 4305 | public void CheckSculptAndLoad() | 4306 | public void CheckSculptAndLoad() |
| 4306 | { | 4307 | { |
| 4307 | if (IsDeleted) | 4308 | if (IsDeleted) |
| @@ -4314,10 +4315,10 @@ namespace OpenSim.Region.Framework.Scenes | |||
| 4314 | 4315 | ||
| 4315 | SceneObjectPart[] parts = m_parts.GetArray(); | 4316 | SceneObjectPart[] parts = m_parts.GetArray(); |
| 4316 | 4317 | ||
| 4317 | // for (int i = 0; i < parts.Length; i++) | 4318 | for (int i = 0; i < parts.Length; i++) |
| 4318 | // parts[i].CheckSculptAndLoad(); | 4319 | parts[i].CheckSculptAndLoad(); |
| 4319 | } | 4320 | } |
| 4320 | 4321 | */ | |
| 4321 | /// <summary> | 4322 | /// <summary> |
| 4322 | /// Set the user group to which this scene object belongs. | 4323 | /// Set the user group to which this scene object belongs. |
| 4323 | /// </summary> | 4324 | /// </summary> |