From b0fbef81d0fa284b13dccb19d9318d0c6a69fdfb Mon Sep 17 00:00:00 2001 From: Melanie Thielker Date: Tue, 12 Aug 2008 22:55:47 +0000 Subject: [PATCH] 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 User --- OpenSim/Region/ClientStack/LindenUDP/LLClientView.cs | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/OpenSim/Region/ClientStack/LindenUDP/LLClientView.cs b/OpenSim/Region/ClientStack/LindenUDP/LLClientView.cs index b143f3e531..2f602e6aff 100644 --- a/OpenSim/Region/ClientStack/LindenUDP/LLClientView.cs +++ b/OpenSim/Region/ClientStack/LindenUDP/LLClientView.cs @@ -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); }