diff options
| author | Melanie Thielker | 2008-11-16 04:57:37 +0000 |
|---|---|---|
| committer | Melanie Thielker | 2008-11-16 04:57:37 +0000 |
| commit | 5aa10a8ab164be34d36508b2cd52e9685fc4be90 (patch) | |
| tree | 09513b8aa45c36954d46433a6c3c716b739c40d5 /OpenSim/Region | |
| parent | * Abstracted some methods from SceneObjectGroup to allow them to be overridde... (diff) | |
| download | opensim-SC_OLD-5aa10a8ab164be34d36508b2cd52e9685fc4be90.zip opensim-SC_OLD-5aa10a8ab164be34d36508b2cd52e9685fc4be90.tar.gz opensim-SC_OLD-5aa10a8ab164be34d36508b2cd52e9685fc4be90.tar.bz2 opensim-SC_OLD-5aa10a8ab164be34d36508b2cd52e9685fc4be90.tar.xz | |
Add group prim count support to land properties
Diffstat (limited to 'OpenSim/Region')
| -rw-r--r-- | OpenSim/Region/Environment/Modules/World/Land/LandObject.cs | 8 |
1 files changed, 7 insertions, 1 deletions
diff --git a/OpenSim/Region/Environment/Modules/World/Land/LandObject.cs b/OpenSim/Region/Environment/Modules/World/Land/LandObject.cs index 097e55f..7929b91 100644 --- a/OpenSim/Region/Environment/Modules/World/Land/LandObject.cs +++ b/OpenSim/Region/Environment/Modules/World/Land/LandObject.cs | |||
| @@ -827,6 +827,11 @@ namespace OpenSim.Region.Environment.Modules.World.Land | |||
| 827 | { | 827 | { |
| 828 | landData.OwnerPrims += prim_count; | 828 | landData.OwnerPrims += prim_count; |
| 829 | } | 829 | } |
| 830 | else if (obj.GroupID == landData.GroupID || | ||
| 831 | prim_owner == landData.GroupID) | ||
| 832 | { | ||
| 833 | landData.GroupPrims += prim_count; | ||
| 834 | } | ||
| 830 | else | 835 | else |
| 831 | { | 836 | { |
| 832 | landData.OtherPrims += prim_count; | 837 | landData.OtherPrims += prim_count; |
| @@ -850,7 +855,8 @@ namespace OpenSim.Region.Environment.Modules.World.Land | |||
| 850 | { | 855 | { |
| 851 | landData.OwnerPrims -= prim_count; | 856 | landData.OwnerPrims -= prim_count; |
| 852 | } | 857 | } |
| 853 | else if (prim_owner == landData.GroupID) | 858 | else if (obj.GroupID == landData.GroupID || |
| 859 | prim_owner == landData.GroupID) | ||
| 854 | { | 860 | { |
| 855 | landData.GroupPrims -= prim_count; | 861 | landData.GroupPrims -= prim_count; |
| 856 | } | 862 | } |