aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim
diff options
context:
space:
mode:
authorMelanie Thielker2008-08-12 22:55:47 +0000
committerMelanie Thielker2008-08-12 22:55:47 +0000
commitb0fbef81d0fa284b13dccb19d9318d0c6a69fdfb (patch)
treeea5ca2cc71326af03132ec25476d9b754e879a17 /OpenSim
parentThanks HomerHorwitz for a patch to enable the Stand Up button when sitting on... (diff)
downloadopensim-SC_OLD-b0fbef81d0fa284b13dccb19d9318d0c6a69fdfb.zip
opensim-SC_OLD-b0fbef81d0fa284b13dccb19d9318d0c6a69fdfb.tar.gz
opensim-SC_OLD-b0fbef81d0fa284b13dccb19d9318d0c6a69fdfb.tar.bz2
opensim-SC_OLD-b0fbef81d0fa284b13dccb19d9318d0c6a69fdfb.tar.xz
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
Diffstat (limited to 'OpenSim')
-rw-r--r--OpenSim/Region/ClientStack/LindenUDP/LLClientView.cs8
1 files changed, 5 insertions, 3 deletions
diff --git a/OpenSim/Region/ClientStack/LindenUDP/LLClientView.cs b/OpenSim/Region/ClientStack/LindenUDP/LLClientView.cs
index b143f3e..2f602e6 100644
--- a/OpenSim/Region/ClientStack/LindenUDP/LLClientView.cs
+++ b/OpenSim/Region/ClientStack/LindenUDP/LLClientView.cs
@@ -2662,9 +2662,11 @@ namespace OpenSim.Region.ClientStack.LindenUDP
2662 EstateCovenantReplyPacket.DataBlock edata = new EstateCovenantReplyPacket.DataBlock(); 2662 EstateCovenantReplyPacket.DataBlock edata = new EstateCovenantReplyPacket.DataBlock();
2663 edata.CovenantID = covenant; 2663 edata.CovenantID = covenant;
2664 edata.CovenantTimestamp = 0; 2664 edata.CovenantTimestamp = 0;
2665 edata.EstateOwnerID = m_scene.RegionInfo.MasterAvatarAssignedUUID; 2665 if(m_scene.RegionInfo.EstateSettings.EstateOwner != LLUUID.Zero)
2666 edata.EstateName = 2666 edata.EstateOwnerID = m_scene.RegionInfo.EstateSettings.EstateOwner;
2667 Helpers.StringToField(m_scene.RegionInfo.MasterAvatarFirstName + " " + m_scene.RegionInfo.MasterAvatarLastName); 2667 else
2668 edata.EstateOwnerID = m_scene.RegionInfo.MasterAvatarAssignedUUID;
2669 edata.EstateName = m_scene.RegionInfo.EstateSettings.EstateName;
2668 einfopack.Data = edata; 2670 einfopack.Data = edata;
2669 this.OutPacket(einfopack, ThrottleOutPacketType.Task); 2671 this.OutPacket(einfopack, ThrottleOutPacketType.Task);
2670 } 2672 }