aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Region
diff options
context:
space:
mode:
authorMelanie Thielker2009-04-16 00:46:24 +0000
committerMelanie Thielker2009-04-16 00:46:24 +0000
commitac96722c1d6b8c6466fcd924a2d92d50853de042 (patch)
tree146d186ec7d71f871fed918f8d9e238bed9fba1b /OpenSim/Region
parentExpose the GroupRecord and it's accessor API (diff)
downloadopensim-SC_OLD-ac96722c1d6b8c6466fcd924a2d92d50853de042.zip
opensim-SC_OLD-ac96722c1d6b8c6466fcd924a2d92d50853de042.tar.gz
opensim-SC_OLD-ac96722c1d6b8c6466fcd924a2d92d50853de042.tar.bz2
opensim-SC_OLD-ac96722c1d6b8c6466fcd924a2d92d50853de042.tar.xz
Fix build break and change some groups interfaces
Diffstat (limited to 'OpenSim/Region')
-rw-r--r--OpenSim/Region/ClientStack/LindenUDP/LLClientView.cs11
-rw-r--r--OpenSim/Region/CoreModules/World/Land/LandObject.cs2
-rw-r--r--OpenSim/Region/Examples/SimpleModule/MyNpcCharacter.cs2
-rw-r--r--OpenSim/Region/OptionalModules/World/NPC/NPCAvatar.cs2
4 files changed, 7 insertions, 10 deletions
diff --git a/OpenSim/Region/ClientStack/LindenUDP/LLClientView.cs b/OpenSim/Region/ClientStack/LindenUDP/LLClientView.cs
index b506434..2c57303 100644
--- a/OpenSim/Region/ClientStack/LindenUDP/LLClientView.cs
+++ b/OpenSim/Region/ClientStack/LindenUDP/LLClientView.cs
@@ -3420,7 +3420,7 @@ namespace OpenSim.Region.ClientStack.LindenUDP
3420 } 3420 }
3421 } 3421 }
3422 3422
3423 public void SendLandObjectOwners(Dictionary<UUID, int> ownersAndCount) 3423 public void SendLandObjectOwners(LandData land, Dictionary<UUID, int> ownersAndCount)
3424 { 3424 {
3425 int notifyCount = ownersAndCount.Count; 3425 int notifyCount = ownersAndCount.Count;
3426 ParcelObjectOwnersReplyPacket pack = (ParcelObjectOwnersReplyPacket)PacketPool.Instance.GetPacket(PacketType.ParcelObjectOwnersReply); 3426 ParcelObjectOwnersReplyPacket pack = (ParcelObjectOwnersReplyPacket)PacketPool.Instance.GetPacket(PacketType.ParcelObjectOwnersReply);
@@ -3445,12 +3445,9 @@ namespace OpenSim.Region.ClientStack.LindenUDP
3445 dataBlock[num] = new ParcelObjectOwnersReplyPacket.DataBlock(); 3445 dataBlock[num] = new ParcelObjectOwnersReplyPacket.DataBlock();
3446 dataBlock[num].Count = ownersAndCount[owner]; 3446 dataBlock[num].Count = ownersAndCount[owner];
3447 3447
3448 if (m_GroupsModule != null) 3448 if (land.GroupID == owner)
3449 { 3449 dataBlock[num].IsGroupOwned = true;
3450 //TODO: There's probably a better way to do this. 3450
3451 GroupProfileData gpd;
3452 dataBlock[num].IsGroupOwned = m_GroupsModule.GetGroupProfile(owner, out gpd);
3453 }
3454 dataBlock[num].OnlineStatus = true; //TODO: fix me later 3451 dataBlock[num].OnlineStatus = true; //TODO: fix me later
3455 dataBlock[num].OwnerID = owner; 3452 dataBlock[num].OwnerID = owner;
3456 3453
diff --git a/OpenSim/Region/CoreModules/World/Land/LandObject.cs b/OpenSim/Region/CoreModules/World/Land/LandObject.cs
index e3e49ba..a19b454 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
734 } 734 }
735 } 735 }
736 736
737 remote_client.SendLandObjectOwners(primCount); 737 remote_client.SendLandObjectOwners(landData, primCount);
738 } 738 }
739 } 739 }
740 740
diff --git a/OpenSim/Region/Examples/SimpleModule/MyNpcCharacter.cs b/OpenSim/Region/Examples/SimpleModule/MyNpcCharacter.cs
index 0e9d255..3c41c02 100644
--- a/OpenSim/Region/Examples/SimpleModule/MyNpcCharacter.cs
+++ b/OpenSim/Region/Examples/SimpleModule/MyNpcCharacter.cs
@@ -885,7 +885,7 @@ namespace OpenSim.Region.Examples.SimpleModule
885 { 885 {
886 } 886 }
887 887
888 public void SendLandObjectOwners(Dictionary<UUID, int> ownersAndCount) 888 public void SendLandObjectOwners(LandData land, Dictionary<UUID, int> ownersAndCount)
889 { 889 {
890 } 890 }
891 891
diff --git a/OpenSim/Region/OptionalModules/World/NPC/NPCAvatar.cs b/OpenSim/Region/OptionalModules/World/NPC/NPCAvatar.cs
index aff26b6..9f8fbb3 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
892 public void SendForceClientSelectObjects(List<uint> objectIDs) 892 public void SendForceClientSelectObjects(List<uint> objectIDs)
893 { 893 {
894 } 894 }
895 public void SendLandObjectOwners(Dictionary<UUID, int> ownersAndCount) 895 public void SendLandObjectOwners(LandData land, Dictionary<UUID, int> ownersAndCount)
896 { 896 {
897 } 897 }
898 public void SendLandParcelOverlay(byte[] data, int sequence_id) 898 public void SendLandParcelOverlay(byte[] data, int sequence_id)