aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Region/ClientStack
diff options
context:
space:
mode:
authorMelanie2010-01-09 14:21:50 +0000
committerMelanie2010-01-09 14:21:50 +0000
commita764eb5dc740c4b7056acad5058d2da0c9c9c740 (patch)
treea1014fb5828a32f3355d0cb37a3ba7fce264dc05 /OpenSim/Region/ClientStack
parentMerge branch 'master' into careminster (diff)
parentAdd functionality to estate "Allowed Users" and "Allowed Groups". Allowed users (diff)
downloadopensim-SC_OLD-a764eb5dc740c4b7056acad5058d2da0c9c9c740.zip
opensim-SC_OLD-a764eb5dc740c4b7056acad5058d2da0c9c9c740.tar.gz
opensim-SC_OLD-a764eb5dc740c4b7056acad5058d2da0c9c9c740.tar.bz2
opensim-SC_OLD-a764eb5dc740c4b7056acad5058d2da0c9c9c740.tar.xz
Merge branch 'master' into careminster
Diffstat (limited to 'OpenSim/Region/ClientStack')
-rw-r--r--OpenSim/Region/ClientStack/LindenUDP/LLClientView.cs17
1 files changed, 9 insertions, 8 deletions
diff --git a/OpenSim/Region/ClientStack/LindenUDP/LLClientView.cs b/OpenSim/Region/ClientStack/LindenUDP/LLClientView.cs
index f3fd249..6a0da7b 100644
--- a/OpenSim/Region/ClientStack/LindenUDP/LLClientView.cs
+++ b/OpenSim/Region/ClientStack/LindenUDP/LLClientView.cs
@@ -3895,7 +3895,8 @@ namespace OpenSim.Region.ClientStack.LindenUDP
3895 return false; 3895 return false;
3896 } 3896 }
3897 3897
3898 public void SendEstateManagersList(UUID invoice, UUID[] EstateManagers, uint estateID) 3898 public void SendEstateList(UUID invoice, int code, UUID[] Data, uint estateID)
3899
3899 { 3900 {
3900 EstateOwnerMessagePacket packet = new EstateOwnerMessagePacket(); 3901 EstateOwnerMessagePacket packet = new EstateOwnerMessagePacket();
3901 packet.AgentData.TransactionID = UUID.Random(); 3902 packet.AgentData.TransactionID = UUID.Random();
@@ -3904,26 +3905,26 @@ namespace OpenSim.Region.ClientStack.LindenUDP
3904 packet.MethodData.Invoice = invoice; 3905 packet.MethodData.Invoice = invoice;
3905 packet.MethodData.Method = Utils.StringToBytes("setaccess"); 3906 packet.MethodData.Method = Utils.StringToBytes("setaccess");
3906 3907
3907 EstateOwnerMessagePacket.ParamListBlock[] returnblock = new EstateOwnerMessagePacket.ParamListBlock[6 + EstateManagers.Length]; 3908 EstateOwnerMessagePacket.ParamListBlock[] returnblock = new EstateOwnerMessagePacket.ParamListBlock[6 + Data.Length];
3908 3909
3909 for (int i = 0; i < (6 + EstateManagers.Length); i++) 3910 for (int i = 0; i < (6 + Data.Length); i++)
3910 { 3911 {
3911 returnblock[i] = new EstateOwnerMessagePacket.ParamListBlock(); 3912 returnblock[i] = new EstateOwnerMessagePacket.ParamListBlock();
3912 } 3913 }
3913 int j = 0; 3914 int j = 0;
3914 3915
3915 returnblock[j].Parameter = Utils.StringToBytes(estateID.ToString()); j++; 3916 returnblock[j].Parameter = Utils.StringToBytes(estateID.ToString()); j++;
3916 returnblock[j].Parameter = Utils.StringToBytes(((int)Constants.EstateAccessCodex.EstateManagers).ToString()); j++; 3917 returnblock[j].Parameter = Utils.StringToBytes(code.ToString()); j++;
3917 returnblock[j].Parameter = Utils.StringToBytes("0"); j++; 3918 returnblock[j].Parameter = Utils.StringToBytes("0"); j++;
3918 returnblock[j].Parameter = Utils.StringToBytes("0"); j++; 3919 returnblock[j].Parameter = Utils.StringToBytes("0"); j++;
3919 returnblock[j].Parameter = Utils.StringToBytes("0"); j++; 3920 returnblock[j].Parameter = Utils.StringToBytes("0"); j++;
3920 returnblock[j].Parameter = Utils.StringToBytes(EstateManagers.Length.ToString()); j++; 3921 returnblock[j].Parameter = Utils.StringToBytes(Data.Length.ToString()); j++;
3921 for (int i = 0; i < EstateManagers.Length; i++) 3922 for (int i = 0; i < Data.Length; i++)
3922 { 3923 {
3923 returnblock[j].Parameter = EstateManagers[i].GetBytes(); j++; 3924 returnblock[j].Parameter = Data[i].GetBytes(); j++;
3924 } 3925 }
3925 packet.ParamList = returnblock; 3926 packet.ParamList = returnblock;
3926 packet.Header.Reliable = false; 3927 packet.Header.Reliable = true;
3927 OutPacket(packet, ThrottleOutPacketType.Task); 3928 OutPacket(packet, ThrottleOutPacketType.Task);
3928 } 3929 }
3929 3930