diff options
author | Justin Clark-Casey (justincc) | 2012-02-03 23:48:12 +0000 |
---|---|---|
committer | Justin Clark-Casey (justincc) | 2012-02-03 23:48:12 +0000 |
commit | 2b6c5fcb3115fa6b963a536f34bd4a4a1a64c598 (patch) | |
tree | 95acd2d2fc13dd77637549d8ce1f0ba78d4eb10d /OpenSim/Region/ClientStack/Linden | |
parent | Change SceneObjectSerializer to use common ExternalRepresentationUtils.Execut... (diff) | |
parent | Merge branch 'master' of ssh://snoopy@opensimulator.org/var/git/opensim (diff) | |
download | opensim-SC_OLD-2b6c5fcb3115fa6b963a536f34bd4a4a1a64c598.zip opensim-SC_OLD-2b6c5fcb3115fa6b963a536f34bd4a4a1a64c598.tar.gz opensim-SC_OLD-2b6c5fcb3115fa6b963a536f34bd4a4a1a64c598.tar.bz2 opensim-SC_OLD-2b6c5fcb3115fa6b963a536f34bd4a4a1a64c598.tar.xz |
Merge branch 'master' of ssh://opensimulator.org/var/git/opensim
Diffstat (limited to 'OpenSim/Region/ClientStack/Linden')
-rw-r--r-- | OpenSim/Region/ClientStack/Linden/UDP/LLClientView.cs | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/OpenSim/Region/ClientStack/Linden/UDP/LLClientView.cs b/OpenSim/Region/ClientStack/Linden/UDP/LLClientView.cs index cdd4957..8273c6f 100644 --- a/OpenSim/Region/ClientStack/Linden/UDP/LLClientView.cs +++ b/OpenSim/Region/ClientStack/Linden/UDP/LLClientView.cs | |||
@@ -4439,7 +4439,7 @@ namespace OpenSim.Region.ClientStack.LindenUDP | |||
4439 | EstateCovenantReplyPacket einfopack = new EstateCovenantReplyPacket(); | 4439 | EstateCovenantReplyPacket einfopack = new EstateCovenantReplyPacket(); |
4440 | EstateCovenantReplyPacket.DataBlock edata = new EstateCovenantReplyPacket.DataBlock(); | 4440 | EstateCovenantReplyPacket.DataBlock edata = new EstateCovenantReplyPacket.DataBlock(); |
4441 | edata.CovenantID = covenant; | 4441 | edata.CovenantID = covenant; |
4442 | edata.CovenantTimestamp = 0; | 4442 | edata.CovenantTimestamp = (uint) m_scene.RegionInfo.RegionSettings.CovenantChangedDateTime; |
4443 | edata.EstateOwnerID = m_scene.RegionInfo.EstateSettings.EstateOwner; | 4443 | edata.EstateOwnerID = m_scene.RegionInfo.EstateSettings.EstateOwner; |
4444 | edata.EstateName = Utils.StringToBytes(m_scene.RegionInfo.EstateSettings.EstateName); | 4444 | edata.EstateName = Utils.StringToBytes(m_scene.RegionInfo.EstateSettings.EstateName); |
4445 | einfopack.Data = edata; | 4445 | einfopack.Data = edata; |
@@ -4447,8 +4447,8 @@ namespace OpenSim.Region.ClientStack.LindenUDP | |||
4447 | } | 4447 | } |
4448 | 4448 | ||
4449 | public void SendDetailedEstateData( | 4449 | public void SendDetailedEstateData( |
4450 | UUID invoice, string estateName, uint estateID, uint parentEstate, uint estateFlags, uint sunPosition, | 4450 | UUID invoice, string estateName, uint estateID, uint parentEstate, uint estateFlags, uint sunPosition, |
4451 | UUID covenant, string abuseEmail, UUID estateOwner) | 4451 | UUID covenant, uint covenantChanged, string abuseEmail, UUID estateOwner) |
4452 | { | 4452 | { |
4453 | // m_log.DebugFormat( | 4453 | // m_log.DebugFormat( |
4454 | // "[LLCLIENTVIEW]: Sending detailed estate data to {0} with covenant asset id {1}", Name, covenant); | 4454 | // "[LLCLIENTVIEW]: Sending detailed estate data to {0} with covenant asset id {1}", Name, covenant); |
@@ -4473,7 +4473,7 @@ namespace OpenSim.Region.ClientStack.LindenUDP | |||
4473 | returnblock[4].Parameter = Utils.StringToBytes(sunPosition.ToString()); | 4473 | returnblock[4].Parameter = Utils.StringToBytes(sunPosition.ToString()); |
4474 | returnblock[5].Parameter = Utils.StringToBytes(parentEstate.ToString()); | 4474 | returnblock[5].Parameter = Utils.StringToBytes(parentEstate.ToString()); |
4475 | returnblock[6].Parameter = Utils.StringToBytes(covenant.ToString()); | 4475 | returnblock[6].Parameter = Utils.StringToBytes(covenant.ToString()); |
4476 | returnblock[7].Parameter = Utils.StringToBytes("1160895077"); // what is this? | 4476 | returnblock[7].Parameter = Utils.StringToBytes(covenantChanged.ToString()); |
4477 | returnblock[8].Parameter = Utils.StringToBytes("1"); // what is this? | 4477 | returnblock[8].Parameter = Utils.StringToBytes("1"); // what is this? |
4478 | returnblock[9].Parameter = Utils.StringToBytes(abuseEmail); | 4478 | returnblock[9].Parameter = Utils.StringToBytes(abuseEmail); |
4479 | 4479 | ||