aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Region/ClientStack
diff options
context:
space:
mode:
authorMelanie Thielker2008-08-01 21:08:00 +0000
committerMelanie Thielker2008-08-01 21:08:00 +0000
commit12c5bfa3e0f42232035d74b3768ea98211dc5e18 (patch)
treec7dbdacf918345872ff633d282951b40797e04ff /OpenSim/Region/ClientStack
parent* minor: add to the thread tracker the thread with which the thread tracker t... (diff)
downloadopensim-SC_OLD-12c5bfa3e0f42232035d74b3768ea98211dc5e18.zip
opensim-SC_OLD-12c5bfa3e0f42232035d74b3768ea98211dc5e18.tar.gz
opensim-SC_OLD-12c5bfa3e0f42232035d74b3768ea98211dc5e18.tar.bz2
opensim-SC_OLD-12c5bfa3e0f42232035d74b3768ea98211dc5e18.tar.xz
Estate series, patch 9 (#9157)
Adds the new access semantics and the new flag (allow only age verified) Plumbs in the abuse email address from sim to viewer. The other way around, libomv appears to be lacking support for the data field in the packet. Includes a migration, run prebuild!
Diffstat (limited to 'OpenSim/Region/ClientStack')
-rw-r--r--OpenSim/Region/ClientStack/LindenUDP/LLClientView.cs7
1 files changed, 4 insertions, 3 deletions
diff --git a/OpenSim/Region/ClientStack/LindenUDP/LLClientView.cs b/OpenSim/Region/ClientStack/LindenUDP/LLClientView.cs
index 2800cc4..4e9b1ae 100644
--- a/OpenSim/Region/ClientStack/LindenUDP/LLClientView.cs
+++ b/OpenSim/Region/ClientStack/LindenUDP/LLClientView.cs
@@ -2657,15 +2657,15 @@ namespace OpenSim.Region.ClientStack.LindenUDP
2657 this.OutPacket(einfopack, ThrottleOutPacketType.Task); 2657 this.OutPacket(einfopack, ThrottleOutPacketType.Task);
2658 } 2658 }
2659 2659
2660 public void SendDetailedEstateData(LLUUID invoice, string estateName, uint estateID, uint parentEstate, uint estateFlags, uint sunPosition, LLUUID covenant) 2660 public void SendDetailedEstateData(LLUUID invoice, string estateName, uint estateID, uint parentEstate, uint estateFlags, uint sunPosition, LLUUID covenant, string abuseEmail)
2661 { 2661 {
2662 EstateOwnerMessagePacket packet = new EstateOwnerMessagePacket(); 2662 EstateOwnerMessagePacket packet = new EstateOwnerMessagePacket();
2663 packet.MethodData.Invoice = invoice; 2663 packet.MethodData.Invoice = invoice;
2664 packet.AgentData.TransactionID = LLUUID.Random(); 2664 packet.AgentData.TransactionID = LLUUID.Random();
2665 packet.MethodData.Method = Helpers.StringToField("estateupdateinfo"); 2665 packet.MethodData.Method = Helpers.StringToField("estateupdateinfo");
2666 EstateOwnerMessagePacket.ParamListBlock[] returnblock = new EstateOwnerMessagePacket.ParamListBlock[9]; 2666 EstateOwnerMessagePacket.ParamListBlock[] returnblock = new EstateOwnerMessagePacket.ParamListBlock[10];
2667 2667
2668 for (int i = 0; i < 9; i++) 2668 for (int i = 0; i < 10; i++)
2669 { 2669 {
2670 returnblock[i] = new EstateOwnerMessagePacket.ParamListBlock(); 2670 returnblock[i] = new EstateOwnerMessagePacket.ParamListBlock();
2671 } 2671 }
@@ -2681,6 +2681,7 @@ namespace OpenSim.Region.ClientStack.LindenUDP
2681 returnblock[6].Parameter = Helpers.StringToField(covenant.ToString()); 2681 returnblock[6].Parameter = Helpers.StringToField(covenant.ToString());
2682 returnblock[7].Parameter = Helpers.StringToField("1160895077"); // what is this? 2682 returnblock[7].Parameter = Helpers.StringToField("1160895077"); // what is this?
2683 returnblock[8].Parameter = Helpers.StringToField("1"); // what is this? 2683 returnblock[8].Parameter = Helpers.StringToField("1"); // what is this?
2684 returnblock[9].Parameter = Helpers.StringToField(abuseEmail);
2684 2685
2685 packet.ParamList = returnblock; 2686 packet.ParamList = returnblock;
2686 packet.Header.Reliable = false; 2687 packet.Header.Reliable = false;