diff options
| author | Diva Canto | 2010-01-10 15:35:15 -0800 |
|---|---|---|
| committer | Diva Canto | 2010-01-10 15:35:15 -0800 |
| commit | c0642bf7e06924397894229677235e2a841768bc (patch) | |
| tree | 3d052597318fd29e107662ab29bb831ff8380582 /OpenSim/Region/ClientStack | |
| parent | * Changed IPresenceService Logout, so that it takes a position and a lookat (diff) | |
| parent | Remove all references to master avatar, replacing with estate owner where (diff) | |
| download | opensim-SC_OLD-c0642bf7e06924397894229677235e2a841768bc.zip opensim-SC_OLD-c0642bf7e06924397894229677235e2a841768bc.tar.gz opensim-SC_OLD-c0642bf7e06924397894229677235e2a841768bc.tar.bz2 opensim-SC_OLD-c0642bf7e06924397894229677235e2a841768bc.tar.xz | |
Merge branch 'presence-refactor' of ssh://diva@opensimulator.org/var/git/opensim into presence-refactor
Diffstat (limited to 'OpenSim/Region/ClientStack')
| -rw-r--r-- | OpenSim/Region/ClientStack/LindenUDP/LLClientView.cs | 7 |
1 files changed, 1 insertions, 6 deletions
diff --git a/OpenSim/Region/ClientStack/LindenUDP/LLClientView.cs b/OpenSim/Region/ClientStack/LindenUDP/LLClientView.cs index 3a802df..81fd86e 100644 --- a/OpenSim/Region/ClientStack/LindenUDP/LLClientView.cs +++ b/OpenSim/Region/ClientStack/LindenUDP/LLClientView.cs | |||
| @@ -4030,10 +4030,7 @@ namespace OpenSim.Region.ClientStack.LindenUDP | |||
| 4030 | EstateCovenantReplyPacket.DataBlock edata = new EstateCovenantReplyPacket.DataBlock(); | 4030 | EstateCovenantReplyPacket.DataBlock edata = new EstateCovenantReplyPacket.DataBlock(); |
| 4031 | edata.CovenantID = covenant; | 4031 | edata.CovenantID = covenant; |
| 4032 | edata.CovenantTimestamp = 0; | 4032 | edata.CovenantTimestamp = 0; |
| 4033 | if (m_scene.RegionInfo.EstateSettings.EstateOwner != UUID.Zero) | 4033 | edata.EstateOwnerID = m_scene.RegionInfo.EstateSettings.EstateOwner; |
| 4034 | edata.EstateOwnerID = m_scene.RegionInfo.EstateSettings.EstateOwner; | ||
| 4035 | else | ||
| 4036 | edata.EstateOwnerID = m_scene.RegionInfo.MasterAvatarAssignedUUID; | ||
| 4037 | edata.EstateName = Utils.StringToBytes(m_scene.RegionInfo.EstateSettings.EstateName); | 4034 | edata.EstateName = Utils.StringToBytes(m_scene.RegionInfo.EstateSettings.EstateName); |
| 4038 | einfopack.Data = edata; | 4035 | einfopack.Data = edata; |
| 4039 | OutPacket(einfopack, ThrottleOutPacketType.Task); | 4036 | OutPacket(einfopack, ThrottleOutPacketType.Task); |
| @@ -4054,8 +4051,6 @@ namespace OpenSim.Region.ClientStack.LindenUDP | |||
| 4054 | 4051 | ||
| 4055 | //Sending Estate Settings | 4052 | //Sending Estate Settings |
| 4056 | returnblock[0].Parameter = Utils.StringToBytes(estateName); | 4053 | returnblock[0].Parameter = Utils.StringToBytes(estateName); |
| 4057 | // TODO: remove this cruft once MasterAvatar is fully deprecated | ||
| 4058 | // | ||
| 4059 | returnblock[1].Parameter = Utils.StringToBytes(estateOwner.ToString()); | 4054 | returnblock[1].Parameter = Utils.StringToBytes(estateOwner.ToString()); |
| 4060 | returnblock[2].Parameter = Utils.StringToBytes(estateID.ToString()); | 4055 | returnblock[2].Parameter = Utils.StringToBytes(estateID.ToString()); |
| 4061 | 4056 | ||