Minor patch: fix an instance where the estate name, as displayed on the
Covenant page of the estate dialog, could be shown as the master avatar's name, or even as Test User0.6.0-stable
parent
c65415d320
commit
b0fbef81d0
|
@ -2662,9 +2662,11 @@ namespace OpenSim.Region.ClientStack.LindenUDP
|
|||
EstateCovenantReplyPacket.DataBlock edata = new EstateCovenantReplyPacket.DataBlock();
|
||||
edata.CovenantID = covenant;
|
||||
edata.CovenantTimestamp = 0;
|
||||
edata.EstateOwnerID = m_scene.RegionInfo.MasterAvatarAssignedUUID;
|
||||
edata.EstateName =
|
||||
Helpers.StringToField(m_scene.RegionInfo.MasterAvatarFirstName + " " + m_scene.RegionInfo.MasterAvatarLastName);
|
||||
if(m_scene.RegionInfo.EstateSettings.EstateOwner != LLUUID.Zero)
|
||||
edata.EstateOwnerID = m_scene.RegionInfo.EstateSettings.EstateOwner;
|
||||
else
|
||||
edata.EstateOwnerID = m_scene.RegionInfo.MasterAvatarAssignedUUID;
|
||||
edata.EstateName = m_scene.RegionInfo.EstateSettings.EstateName;
|
||||
einfopack.Data = edata;
|
||||
this.OutPacket(einfopack, ThrottleOutPacketType.Task);
|
||||
}
|
||||
|
|
Loading…
Reference in New Issue