OpenSim
/
OpenSimMirror
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Fix build break and change some groups interfaces

0.6.5-rc1
Melanie Thielker 2009-04-16 00:46:24 +00:00
parent 7e95783dd3
commit ac96722c1d
7 changed files with 10 additions and 13 deletions
OpenSim
Client/MXP/ClientStack
Framework
Region
ClientStack/LindenUDP
CoreModules/World/Land
Examples/SimpleModule
OptionalModules/World/NPC
Tests/Common/Mock

2
OpenSim/Client/MXP/ClientStack/MXPClientView.cs
View File

@ -1228,7 +1228,7 @@ namespace OpenSim.Client.MXP.ClientStack
// Need to translate to MXP somehow // 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 // Need to translate to MXP somehow
} }

2
OpenSim/Framework/IClientAPI.cs
View File

@ -996,7 +996,7 @@ namespace OpenSim.Framework
void SendLandAccessListData(List<UUID> avatars, uint accessFlag, int localLandID); void SendLandAccessListData(List<UUID> avatars, uint accessFlag, int localLandID);
void SendForceClientSelectObjects(List<uint> objectIDs); 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); void SendLandParcelOverlay(byte[] data, int sequence_id);
#region Parcel Methods #region Parcel Methods

11
OpenSim/Region/ClientStack/LindenUDP/LLClientView.cs
View File

@ -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; int notifyCount = ownersAndCount.Count;
ParcelObjectOwnersReplyPacket pack = (ParcelObjectOwnersReplyPacket)PacketPool.Instance.GetPacket(PacketType.ParcelObjectOwnersReply); ParcelObjectOwnersReplyPacket pack = (ParcelObjectOwnersReplyPacket)PacketPool.Instance.GetPacket(PacketType.ParcelObjectOwnersReply);
@ -3445,12 +3445,9 @@ namespace OpenSim.Region.ClientStack.LindenUDP
dataBlock[num] = new ParcelObjectOwnersReplyPacket.DataBlock(); dataBlock[num] = new ParcelObjectOwnersReplyPacket.DataBlock();
dataBlock[num].Count = ownersAndCount[owner]; dataBlock[num].Count = ownersAndCount[owner];
if (m_GroupsModule != null) if (land.GroupID == owner)
{ dataBlock[num].IsGroupOwned = true;
//TODO: There's probably a better way to do this.
GroupProfileData gpd;
dataBlock[num].IsGroupOwned = m_GroupsModule.GetGroupProfile(owner, out gpd);
}
dataBlock[num].OnlineStatus = true; //TODO: fix me later dataBlock[num].OnlineStatus = true; //TODO: fix me later
dataBlock[num].OwnerID = owner; dataBlock[num].OwnerID = owner;

2
OpenSim/Region/CoreModules/World/Land/LandObject.cs
View File

@ -734,7 +734,7 @@ namespace OpenSim.Region.CoreModules.World.Land
} }
} }
remote_client.SendLandObjectOwners(primCount); remote_client.SendLandObjectOwners(landData, primCount);
} }
} }

2
OpenSim/Region/Examples/SimpleModule/MyNpcCharacter.cs
View File

@ -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)
{ {
} }

2
OpenSim/Region/OptionalModules/World/NPC/NPCAvatar.cs
View File

@ -892,7 +892,7 @@ namespace OpenSim.Region.OptionalModules.World.NPC
public void SendForceClientSelectObjects(List<uint> objectIDs) 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) public void SendLandParcelOverlay(byte[] data, int sequence_id)

2
OpenSim/Tests/Common/Mock/TestClient.cs
View File

@ -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)
{ {
} }