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

* Lash up mantis 1064 - nre thrown in LandObject.sendLandObjectOwners() 

* From reading the code, the cause must be that a 'show objects on my parcel' is performed when there are objects belonging to more than 32 people
* I'm not sure why there is a hardcoded 32 limit but I'm leaving it in place for now.  I don't regard this mantis as resolved.
0.6.0-stable
Justin Clarke Casey 2008-04-28 22:21:42 +00:00
parent 3ddbf28cd0
commit dbdeb40d46
1 changed files with 36 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

47
OpenSim/Region/Environment/Modules/LandManagement/LandObject.cs
View File

@ -772,19 +772,28 @@ namespace OpenSim.Region.Environment.Modules.LandManagement
} }
} }
/// <summary>
/// Notify the parcel owner each avatar that owns prims situated on their land. This notification includes
/// aggreagete details such as the number of prims.
///
/// </summary>
/// <param name="remote_client">
/// A <see cref="IClientAPI"/>
/// </param>
public void sendLandObjectOwners(IClientAPI remote_client) public void sendLandObjectOwners(IClientAPI remote_client)
{ {
Dictionary<LLUUID, int> ownersAndCount = new Dictionary<LLUUID, int>(); Dictionary<LLUUID, int> primCount = new Dictionary<LLUUID, int>();
ParcelObjectOwnersReplyPacket pack = (ParcelObjectOwnersReplyPacket) PacketPool.Instance.GetPacket(PacketType.ParcelObjectOwnersReply); ParcelObjectOwnersReplyPacket pack
= (ParcelObjectOwnersReplyPacket) PacketPool.Instance.GetPacket(PacketType.ParcelObjectOwnersReply);
// TODO: don't create new blocks if recycling an old packet // TODO: don't create new blocks if recycling an old packet
foreach (SceneObjectGroup obj in primsOverMe) foreach (SceneObjectGroup obj in primsOverMe)
{ {
try try
{ {
if (!ownersAndCount.ContainsKey(obj.OwnerID)) if (!primCount.ContainsKey(obj.OwnerID))
{ {
ownersAndCount.Add(obj.OwnerID, 0); primCount.Add(obj.OwnerID, 0);
} }
} }
catch (NullReferenceException) catch (NullReferenceException)
@ -793,36 +802,50 @@ namespace OpenSim.Region.Environment.Modules.LandManagement
} }
try try
{ {
ownersAndCount[obj.OwnerID] += obj.PrimCount; primCount[obj.OwnerID] += obj.PrimCount;
} }
catch (KeyNotFoundException) catch (KeyNotFoundException)
{ {
m_log.Error("[LAND]: Unable to match a prim with it's owner."); m_log.Error("[LAND]: Unable to match a prim with it's owner.");
} }
} }
if (ownersAndCount.Count > 0)
{
ParcelObjectOwnersReplyPacket.DataBlock[] dataBlock = new ParcelObjectOwnersReplyPacket.DataBlock[32];
if (ownersAndCount.Count < 32) int notifyCount = primCount.Count;
if (notifyCount > 0)
{ {
dataBlock = new ParcelObjectOwnersReplyPacket.DataBlock[ownersAndCount.Count]; if (notifyCount > 32)
{
m_log.InfoFormat(
"[LAND]: More than {0} avatars own prims on this parcel. Only sending back details of first {0}"
+ " - a developer might want to investigate whether this is a hard limit", 32);
notifyCount = 32;
} }
ParcelObjectOwnersReplyPacket.DataBlock[] dataBlock
= new ParcelObjectOwnersReplyPacket.DataBlock[notifyCount];
int num = 0; int num = 0;
foreach (LLUUID owner in ownersAndCount.Keys) foreach (LLUUID owner in primCount.Keys)
{ {
dataBlock[num] = new ParcelObjectOwnersReplyPacket.DataBlock(); dataBlock[num] = new ParcelObjectOwnersReplyPacket.DataBlock();
dataBlock[num].Count = ownersAndCount[owner]; dataBlock[num].Count = primCount[owner];
dataBlock[num].IsGroupOwned = false; //TODO: fix me when group support is added dataBlock[num].IsGroupOwned = false; //TODO: fix me when group support is added
dataBlock[num].OnlineStatus = true; //TODO: fix me later dataBlock[num].OnlineStatus = true; //TODO: fix me later
dataBlock[num].OwnerID = owner; dataBlock[num].OwnerID = owner;
num++; num++;
if (num >= notifyCount)
{
break;
} }
}
pack.Data = dataBlock; pack.Data = dataBlock;
} }
remote_client.OutPacket(pack, ThrottleOutPacketType.Task); remote_client.OutPacket(pack, ThrottleOutPacketType.Task);
} }