diff options
author | Tom | 2011-09-04 07:06:36 -0700 |
---|---|---|
committer | Tom | 2011-09-04 07:06:36 -0700 |
commit | 66dec3b8742eff04fbbcc6e3249fe4ba87986500 (patch) | |
tree | 76cc708a821d35fac5cdbbce2de304b47064e732 /OpenSim/Region/CoreModules/World/Estate | |
parent | Guard another nullref (diff) | |
parent | Fixed BulletSim config files for Linux *.so libraries. (diff) | |
download | opensim-SC_OLD-66dec3b8742eff04fbbcc6e3249fe4ba87986500.zip opensim-SC_OLD-66dec3b8742eff04fbbcc6e3249fe4ba87986500.tar.gz opensim-SC_OLD-66dec3b8742eff04fbbcc6e3249fe4ba87986500.tar.bz2 opensim-SC_OLD-66dec3b8742eff04fbbcc6e3249fe4ba87986500.tar.xz |
Resolve merge commits, stage 1
Diffstat (limited to 'OpenSim/Region/CoreModules/World/Estate')
-rw-r--r-- | OpenSim/Region/CoreModules/World/Estate/EstateManagementModule.cs | 50 |
1 files changed, 22 insertions, 28 deletions
diff --git a/OpenSim/Region/CoreModules/World/Estate/EstateManagementModule.cs b/OpenSim/Region/CoreModules/World/Estate/EstateManagementModule.cs index b96f300..fb32288 100644 --- a/OpenSim/Region/CoreModules/World/Estate/EstateManagementModule.cs +++ b/OpenSim/Region/CoreModules/World/Estate/EstateManagementModule.cs | |||
@@ -875,41 +875,35 @@ namespace OpenSim.Region.CoreModules.World.Estate | |||
875 | SceneObjectPart prt = Scene.GetSceneObjectPart(obj); | 875 | SceneObjectPart prt = Scene.GetSceneObjectPart(obj); |
876 | if (prt != null) | 876 | if (prt != null) |
877 | { | 877 | { |
878 | if (prt.ParentGroup != null) | 878 | SceneObjectGroup sog = prt.ParentGroup; |
879 | LandStatReportItem lsri = new LandStatReportItem(); | ||
880 | lsri.LocationX = sog.AbsolutePosition.X; | ||
881 | lsri.LocationY = sog.AbsolutePosition.Y; | ||
882 | lsri.LocationZ = sog.AbsolutePosition.Z; | ||
883 | lsri.Score = SceneData[obj]; | ||
884 | lsri.TaskID = sog.UUID; | ||
885 | lsri.TaskLocalID = sog.LocalId; | ||
886 | lsri.TaskName = sog.GetPartName(obj); | ||
887 | lsri.OwnerName = "waiting"; | ||
888 | lock (uuidNameLookupList) | ||
889 | uuidNameLookupList.Add(sog.OwnerID); | ||
890 | |||
891 | if (filter.Length != 0) | ||
879 | { | 892 | { |
880 | SceneObjectGroup sog = prt.ParentGroup; | 893 | if ((lsri.OwnerName.Contains(filter) || lsri.TaskName.Contains(filter))) |
881 | if (sog != null) | ||
882 | { | 894 | { |
883 | LandStatReportItem lsri = new LandStatReportItem(); | 895 | } |
884 | lsri.LocationX = sog.AbsolutePosition.X; | 896 | else |
885 | lsri.LocationY = sog.AbsolutePosition.Y; | 897 | { |
886 | lsri.LocationZ = sog.AbsolutePosition.Z; | 898 | continue; |
887 | lsri.Score = SceneData[obj]; | ||
888 | lsri.TaskID = sog.UUID; | ||
889 | lsri.TaskLocalID = sog.LocalId; | ||
890 | lsri.TaskName = sog.GetPartName(obj); | ||
891 | lsri.OwnerName = "waiting"; | ||
892 | lock (uuidNameLookupList) | ||
893 | uuidNameLookupList.Add(sog.OwnerID); | ||
894 | |||
895 | if (filter.Length != 0) | ||
896 | { | ||
897 | if ((lsri.OwnerName.Contains(filter) || lsri.TaskName.Contains(filter))) | ||
898 | { | ||
899 | } | ||
900 | else | ||
901 | { | ||
902 | continue; | ||
903 | } | ||
904 | } | ||
905 | |||
906 | SceneReport.Add(lsri); | ||
907 | } | 899 | } |
908 | } | 900 | } |
909 | } | ||
910 | 901 | ||
902 | SceneReport.Add(lsri); | ||
903 | } | ||
911 | } | 904 | } |
912 | } | 905 | } |
906 | |||
913 | remoteClient.SendLandStatReply(reportType, requestFlags, (uint)SceneReport.Count,SceneReport.ToArray()); | 907 | remoteClient.SendLandStatReply(reportType, requestFlags, (uint)SceneReport.Count,SceneReport.ToArray()); |
914 | 908 | ||
915 | if (uuidNameLookupList.Count > 0) | 909 | if (uuidNameLookupList.Count > 0) |