aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Region/CoreModules/World/Estate/EstateManagementModule.cs
diff options
context:
space:
mode:
Diffstat (limited to 'OpenSim/Region/CoreModules/World/Estate/EstateManagementModule.cs')
-rw-r--r--OpenSim/Region/CoreModules/World/Estate/EstateManagementModule.cs50
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 3aed6ba..d0605e3 100644
--- a/OpenSim/Region/CoreModules/World/Estate/EstateManagementModule.cs
+++ b/OpenSim/Region/CoreModules/World/Estate/EstateManagementModule.cs
@@ -851,41 +851,35 @@ namespace OpenSim.Region.CoreModules.World.Estate
851 SceneObjectPart prt = Scene.GetSceneObjectPart(obj); 851 SceneObjectPart prt = Scene.GetSceneObjectPart(obj);
852 if (prt != null) 852 if (prt != null)
853 { 853 {
854 if (prt.ParentGroup != null) 854 SceneObjectGroup sog = prt.ParentGroup;
855 LandStatReportItem lsri = new LandStatReportItem();
856 lsri.LocationX = sog.AbsolutePosition.X;
857 lsri.LocationY = sog.AbsolutePosition.Y;
858 lsri.LocationZ = sog.AbsolutePosition.Z;
859 lsri.Score = SceneData[obj];
860 lsri.TaskID = sog.UUID;
861 lsri.TaskLocalID = sog.LocalId;
862 lsri.TaskName = sog.GetPartName(obj);
863 lsri.OwnerName = "waiting";
864 lock (uuidNameLookupList)
865 uuidNameLookupList.Add(sog.OwnerID);
866
867 if (filter.Length != 0)
855 { 868 {
856 SceneObjectGroup sog = prt.ParentGroup; 869 if ((lsri.OwnerName.Contains(filter) || lsri.TaskName.Contains(filter)))
857 if (sog != null)
858 { 870 {
859 LandStatReportItem lsri = new LandStatReportItem(); 871 }
860 lsri.LocationX = sog.AbsolutePosition.X; 872 else
861 lsri.LocationY = sog.AbsolutePosition.Y; 873 {
862 lsri.LocationZ = sog.AbsolutePosition.Z; 874 continue;
863 lsri.Score = SceneData[obj];
864 lsri.TaskID = sog.UUID;
865 lsri.TaskLocalID = sog.LocalId;
866 lsri.TaskName = sog.GetPartName(obj);
867 lsri.OwnerName = "waiting";
868 lock (uuidNameLookupList)
869 uuidNameLookupList.Add(sog.OwnerID);
870
871 if (filter.Length != 0)
872 {
873 if ((lsri.OwnerName.Contains(filter) || lsri.TaskName.Contains(filter)))
874 {
875 }
876 else
877 {
878 continue;
879 }
880 }
881
882 SceneReport.Add(lsri);
883 } 875 }
884 } 876 }
885 }
886 877
878 SceneReport.Add(lsri);
879 }
887 } 880 }
888 } 881 }
882
889 remoteClient.SendLandStatReply(reportType, requestFlags, (uint)SceneReport.Count,SceneReport.ToArray()); 883 remoteClient.SendLandStatReply(reportType, requestFlags, (uint)SceneReport.Count,SceneReport.ToArray());
890 884
891 if (uuidNameLookupList.Count > 0) 885 if (uuidNameLookupList.Count > 0)