From ac96722c1d6b8c6466fcd924a2d92d50853de042 Mon Sep 17 00:00:00 2001
From: Melanie Thielker <melanie@t-data.com>
Date: Thu, 16 Apr 2009 00:46:24 +0000
Subject: [PATCH] Fix build break and change some groups interfaces

---
 OpenSim/Client/MXP/ClientStack/MXPClientView.cs       |  2 +-
 OpenSim/Framework/IClientAPI.cs                       |  2 +-
 OpenSim/Region/ClientStack/LindenUDP/LLClientView.cs  | 11 ++++-------
 OpenSim/Region/CoreModules/World/Land/LandObject.cs   |  2 +-
 .../Region/Examples/SimpleModule/MyNpcCharacter.cs    |  2 +-
 OpenSim/Region/OptionalModules/World/NPC/NPCAvatar.cs |  2 +-
 OpenSim/Tests/Common/Mock/TestClient.cs               |  2 +-
 7 files changed, 10 insertions(+), 13 deletions(-)

diff --git a/OpenSim/Client/MXP/ClientStack/MXPClientView.cs b/OpenSim/Client/MXP/ClientStack/MXPClientView.cs
index 04b9c3824e..96e382c0e0 100644
--- a/OpenSim/Client/MXP/ClientStack/MXPClientView.cs
+++ b/OpenSim/Client/MXP/ClientStack/MXPClientView.cs
@@ -1228,7 +1228,7 @@ namespace OpenSim.Client.MXP.ClientStack
             // Need to translate to MXP somehow
         }
 
-        public void SendLandObjectOwners(Dictionary<UUID, int> ownersAndCount)
+        public void SendLandObjectOwners(LandData land, Dictionary<UUID, int> ownersAndCount)
         {
             // Need to translate to MXP somehow
         }
diff --git a/OpenSim/Framework/IClientAPI.cs b/OpenSim/Framework/IClientAPI.cs
index 27cf44fb3f..b4c37969ec 100644
--- a/OpenSim/Framework/IClientAPI.cs
+++ b/OpenSim/Framework/IClientAPI.cs
@@ -996,7 +996,7 @@ namespace OpenSim.Framework
 
         void SendLandAccessListData(List<UUID> avatars, uint accessFlag, int localLandID);
         void SendForceClientSelectObjects(List<uint> objectIDs);
-        void SendLandObjectOwners(Dictionary<UUID, int> ownersAndCount);
+        void SendLandObjectOwners(LandData land, Dictionary<UUID, int> ownersAndCount);
         void SendLandParcelOverlay(byte[] data, int sequence_id);
 
         #region Parcel Methods
diff --git a/OpenSim/Region/ClientStack/LindenUDP/LLClientView.cs b/OpenSim/Region/ClientStack/LindenUDP/LLClientView.cs
index b5064341e2..2c57303642 100644
--- a/OpenSim/Region/ClientStack/LindenUDP/LLClientView.cs
+++ b/OpenSim/Region/ClientStack/LindenUDP/LLClientView.cs
@@ -3420,7 +3420,7 @@ namespace OpenSim.Region.ClientStack.LindenUDP
             }
         }
 
-        public void SendLandObjectOwners(Dictionary<UUID, int> ownersAndCount)
+        public void SendLandObjectOwners(LandData land, Dictionary<UUID, int> ownersAndCount)
         {
             int notifyCount = ownersAndCount.Count;
             ParcelObjectOwnersReplyPacket pack = (ParcelObjectOwnersReplyPacket)PacketPool.Instance.GetPacket(PacketType.ParcelObjectOwnersReply);
@@ -3445,12 +3445,9 @@ namespace OpenSim.Region.ClientStack.LindenUDP
                     dataBlock[num] = new ParcelObjectOwnersReplyPacket.DataBlock();
                     dataBlock[num].Count = ownersAndCount[owner];
 
-                    if (m_GroupsModule != null)
-                    {
-                        //TODO: There's probably a better way to do this.
-                        GroupProfileData gpd;
-                        dataBlock[num].IsGroupOwned = m_GroupsModule.GetGroupProfile(owner, out gpd); 
-                    }
+                    if (land.GroupID == owner)
+                        dataBlock[num].IsGroupOwned = true;
+
                     dataBlock[num].OnlineStatus = true; //TODO: fix me later
                     dataBlock[num].OwnerID = owner;
 
diff --git a/OpenSim/Region/CoreModules/World/Land/LandObject.cs b/OpenSim/Region/CoreModules/World/Land/LandObject.cs
index e3e49ba6c4..a19b45489e 100644
--- a/OpenSim/Region/CoreModules/World/Land/LandObject.cs
+++ b/OpenSim/Region/CoreModules/World/Land/LandObject.cs
@@ -734,7 +734,7 @@ namespace OpenSim.Region.CoreModules.World.Land
                     }
                 }
 
-                remote_client.SendLandObjectOwners(primCount);
+                remote_client.SendLandObjectOwners(landData, primCount);
             }
         }
 
diff --git a/OpenSim/Region/Examples/SimpleModule/MyNpcCharacter.cs b/OpenSim/Region/Examples/SimpleModule/MyNpcCharacter.cs
index 0e9d2551c3..3c41c02235 100644
--- a/OpenSim/Region/Examples/SimpleModule/MyNpcCharacter.cs
+++ b/OpenSim/Region/Examples/SimpleModule/MyNpcCharacter.cs
@@ -885,7 +885,7 @@ namespace OpenSim.Region.Examples.SimpleModule
         {
         }
         
-        public void SendLandObjectOwners(Dictionary<UUID, int> ownersAndCount)
+        public void SendLandObjectOwners(LandData land, Dictionary<UUID, int> ownersAndCount)
         {
         }
         
diff --git a/OpenSim/Region/OptionalModules/World/NPC/NPCAvatar.cs b/OpenSim/Region/OptionalModules/World/NPC/NPCAvatar.cs
index aff26b63fa..9f8fbb3989 100644
--- a/OpenSim/Region/OptionalModules/World/NPC/NPCAvatar.cs
+++ b/OpenSim/Region/OptionalModules/World/NPC/NPCAvatar.cs
@@ -892,7 +892,7 @@ namespace OpenSim.Region.OptionalModules.World.NPC
         public void SendForceClientSelectObjects(List<uint> objectIDs)
         {
         }
-        public void SendLandObjectOwners(Dictionary<UUID, int> ownersAndCount)
+        public void SendLandObjectOwners(LandData land, Dictionary<UUID, int> ownersAndCount)
         {
         }
         public void SendLandParcelOverlay(byte[] data, int sequence_id)
diff --git a/OpenSim/Tests/Common/Mock/TestClient.cs b/OpenSim/Tests/Common/Mock/TestClient.cs
index 15e92da470..ff2e3ca255 100644
--- a/OpenSim/Tests/Common/Mock/TestClient.cs
+++ b/OpenSim/Tests/Common/Mock/TestClient.cs
@@ -929,7 +929,7 @@ namespace OpenSim.Tests.Common.Mock
         {
         }
 
-        public void SendLandObjectOwners(Dictionary<UUID, int> ownersAndCount)
+        public void SendLandObjectOwners(LandData land, Dictionary<UUID, int> ownersAndCount)
         {
         }