diff options
author | Justin Clark-Casey (justincc) | 2011-07-11 02:18:19 +0100 |
---|---|---|
committer | Justin Clark-Casey (justincc) | 2011-07-11 02:18:19 +0100 |
commit | 01b98c2e6267cb13cf18f8baeb2b38fd5b6a6cdf (patch) | |
tree | 3062f9501e68dbb0f44d35343cf51967619034df /OpenSim | |
parent | minor: remove mono compiler warning (diff) | |
download | opensim-SC_OLD-01b98c2e6267cb13cf18f8baeb2b38fd5b6a6cdf.zip opensim-SC_OLD-01b98c2e6267cb13cf18f8baeb2b38fd5b6a6cdf.tar.gz opensim-SC_OLD-01b98c2e6267cb13cf18f8baeb2b38fd5b6a6cdf.tar.bz2 opensim-SC_OLD-01b98c2e6267cb13cf18f8baeb2b38fd5b6a6cdf.tar.xz |
refactor: Make arguments for SceneObjectGroup.UpdatePrimFlags() more readable
Diffstat (limited to 'OpenSim')
-rw-r--r-- | OpenSim/Region/Framework/Scenes/SceneObjectGroup.cs | 14 |
1 files changed, 8 insertions, 6 deletions
diff --git a/OpenSim/Region/Framework/Scenes/SceneObjectGroup.cs b/OpenSim/Region/Framework/Scenes/SceneObjectGroup.cs index 42ac9aa..4b8e370 100644 --- a/OpenSim/Region/Framework/Scenes/SceneObjectGroup.cs +++ b/OpenSim/Region/Framework/Scenes/SceneObjectGroup.cs | |||
@@ -2513,14 +2513,15 @@ namespace OpenSim.Region.Framework.Scenes | |||
2513 | /// Update prim flags for this group. | 2513 | /// Update prim flags for this group. |
2514 | /// </summary> | 2514 | /// </summary> |
2515 | /// <param name="localID"></param> | 2515 | /// <param name="localID"></param> |
2516 | /// <param name="type"></param> | 2516 | /// <param name="UsePhysics"></param> |
2517 | /// <param name="inUse"></param> | 2517 | /// <param name="SetTemporary"></param> |
2518 | /// <param name="data"></param> | 2518 | /// <param name="SetPhantom"></param> |
2519 | public void UpdatePrimFlags(uint localID, bool UsePhysics, bool IsTemporary, bool IsPhantom, bool IsVolumeDetect) | 2519 | /// <param name="SetVolumeDetect"></param> |
2520 | public void UpdatePrimFlags(uint localID, bool UsePhysics, bool SetTemporary, bool SetPhantom, bool SetVolumeDetect) | ||
2520 | { | 2521 | { |
2521 | SceneObjectPart selectionPart = GetChildPart(localID); | 2522 | SceneObjectPart selectionPart = GetChildPart(localID); |
2522 | 2523 | ||
2523 | if (IsTemporary) | 2524 | if (SetTemporary) |
2524 | { | 2525 | { |
2525 | DetachFromBackup(); | 2526 | DetachFromBackup(); |
2526 | // Remove from database and parcel prim count | 2527 | // Remove from database and parcel prim count |
@@ -2545,7 +2546,7 @@ namespace OpenSim.Region.Framework.Scenes | |||
2545 | } | 2546 | } |
2546 | 2547 | ||
2547 | for (int i = 0; i < parts.Length; i++) | 2548 | for (int i = 0; i < parts.Length; i++) |
2548 | parts[i].UpdatePrimFlags(UsePhysics, IsTemporary, IsPhantom, IsVolumeDetect); | 2549 | parts[i].UpdatePrimFlags(UsePhysics, SetTemporary, SetPhantom, SetVolumeDetect); |
2549 | } | 2550 | } |
2550 | } | 2551 | } |
2551 | 2552 | ||
@@ -3292,6 +3293,7 @@ namespace OpenSim.Region.Framework.Scenes | |||
3292 | { | 3293 | { |
3293 | if (IsDeleted) | 3294 | if (IsDeleted) |
3294 | return; | 3295 | return; |
3296 | |||
3295 | if ((RootPart.GetEffectiveObjectFlags() & (uint)PrimFlags.Phantom) != 0) | 3297 | if ((RootPart.GetEffectiveObjectFlags() & (uint)PrimFlags.Phantom) != 0) |
3296 | return; | 3298 | return; |
3297 | 3299 | ||