aboutsummaryrefslogtreecommitdiffstatshomepage
diff options
context:
space:
mode:
authorMelanie2010-02-28 22:56:31 +0000
committerMelanie2010-02-28 22:56:31 +0000
commit86c621fdc77fadb898cf53578e83746cd8f8711b (patch)
treedf69ad31237d4d2b459acf8a200a4bc1f6cabbcf
parentAdd missing ChangeUserRights packet sender (diff)
downloadopensim-SC_OLD-86c621fdc77fadb898cf53578e83746cd8f8711b.zip
opensim-SC_OLD-86c621fdc77fadb898cf53578e83746cd8f8711b.tar.gz
opensim-SC_OLD-86c621fdc77fadb898cf53578e83746cd8f8711b.tar.bz2
opensim-SC_OLD-86c621fdc77fadb898cf53578e83746cd8f8711b.tar.xz
Change the signature of SendChangeUserRights, because we have to send
this to both parties
-rw-r--r--OpenSim/Client/MXP/ClientStack/MXPClientView.cs2
-rw-r--r--OpenSim/Client/Sirikata/ClientStack/SirikataClientView.cs2
-rw-r--r--OpenSim/Client/VWoHTTP/ClientStack/VWHClientView.cs2
-rw-r--r--OpenSim/Framework/IClientAPI.cs2
-rw-r--r--OpenSim/Region/ClientStack/LindenUDP/LLClientView.cs4
-rw-r--r--OpenSim/Region/Examples/SimpleModule/MyNpcCharacter.cs2
-rw-r--r--OpenSim/Region/OptionalModules/Agent/InternetRelayClientView/Server/IRCClientView.cs2
-rw-r--r--OpenSim/Region/OptionalModules/World/NPC/NPCAvatar.cs2
-rw-r--r--OpenSim/Tests/Common/Mock/TestClient.cs2
9 files changed, 10 insertions, 10 deletions
diff --git a/OpenSim/Client/MXP/ClientStack/MXPClientView.cs b/OpenSim/Client/MXP/ClientStack/MXPClientView.cs
index b40a09b..cf87a30 100644
--- a/OpenSim/Client/MXP/ClientStack/MXPClientView.cs
+++ b/OpenSim/Client/MXP/ClientStack/MXPClientView.cs
@@ -1707,7 +1707,7 @@ namespace OpenSim.Client.MXP.ClientStack
1707 { 1707 {
1708 } 1708 }
1709 1709
1710 public void SendChangeUserRights(UUID friendID, int rights) 1710 public void SendChangeUserRights(UUID agentID, UUID friendID, int rights)
1711 { 1711 {
1712 } 1712 }
1713 } 1713 }
diff --git a/OpenSim/Client/Sirikata/ClientStack/SirikataClientView.cs b/OpenSim/Client/Sirikata/ClientStack/SirikataClientView.cs
index 22a37d1..56f5f8f 100644
--- a/OpenSim/Client/Sirikata/ClientStack/SirikataClientView.cs
+++ b/OpenSim/Client/Sirikata/ClientStack/SirikataClientView.cs
@@ -1195,7 +1195,7 @@ namespace OpenSim.Client.Sirikata.ClientStack
1195 { 1195 {
1196 } 1196 }
1197 1197
1198 public void SendChangeUserRights(UUID friendID, int rights) 1198 public void SendChangeUserRights(UUID agentID, UUID friendID, int rights)
1199 { 1199 {
1200 } 1200 }
1201 1201
diff --git a/OpenSim/Client/VWoHTTP/ClientStack/VWHClientView.cs b/OpenSim/Client/VWoHTTP/ClientStack/VWHClientView.cs
index 2630774..b8f46dc 100644
--- a/OpenSim/Client/VWoHTTP/ClientStack/VWHClientView.cs
+++ b/OpenSim/Client/VWoHTTP/ClientStack/VWHClientView.cs
@@ -1211,7 +1211,7 @@ namespace OpenSim.Client.VWoHTTP.ClientStack
1211 { 1211 {
1212 } 1212 }
1213 1213
1214 public void SendChangeUserRights(UUID friendID, int rights) 1214 public void SendChangeUserRights(UUID agentID, UUID friendID, int rights)
1215 { 1215 {
1216 } 1216 }
1217 } 1217 }
diff --git a/OpenSim/Framework/IClientAPI.cs b/OpenSim/Framework/IClientAPI.cs
index 1daca32..82b5968 100644
--- a/OpenSim/Framework/IClientAPI.cs
+++ b/OpenSim/Framework/IClientAPI.cs
@@ -1478,6 +1478,6 @@ namespace OpenSim.Framework
1478 1478
1479 void SendGroupTransactionsSummaryDetails(IClientAPI sender,UUID groupID, UUID transactionID, UUID sessionID,int amt); 1479 void SendGroupTransactionsSummaryDetails(IClientAPI sender,UUID groupID, UUID transactionID, UUID sessionID,int amt);
1480 1480
1481 void SendChangeUserRights(UUID friendID, int rights); 1481 void SendChangeUserRights(UUID agentID, UUID friendID, int rights);
1482 } 1482 }
1483} 1483}
diff --git a/OpenSim/Region/ClientStack/LindenUDP/LLClientView.cs b/OpenSim/Region/ClientStack/LindenUDP/LLClientView.cs
index 8448236..ef49205 100644
--- a/OpenSim/Region/ClientStack/LindenUDP/LLClientView.cs
+++ b/OpenSim/Region/ClientStack/LindenUDP/LLClientView.cs
@@ -11606,12 +11606,12 @@ namespace OpenSim.Region.ClientStack.LindenUDP
11606 OutPacket(packet, ThrottleOutPacketType.Task); 11606 OutPacket(packet, ThrottleOutPacketType.Task);
11607 } 11607 }
11608 11608
11609 public void SendChangeUserRights(UUID friendID, int rights) 11609 public void SendChangeUserRights(UUID agentID, UUID friendID, int rights)
11610 { 11610 {
11611 ChangeUserRightsPacket packet = (ChangeUserRightsPacket)PacketPool.Instance.GetPacket(PacketType.ChangeUserRights); 11611 ChangeUserRightsPacket packet = (ChangeUserRightsPacket)PacketPool.Instance.GetPacket(PacketType.ChangeUserRights);
11612 11612
11613 packet.AgentData = new ChangeUserRightsPacket.AgentDataBlock(); 11613 packet.AgentData = new ChangeUserRightsPacket.AgentDataBlock();
11614 packet.AgentData.AgentID = AgentId; 11614 packet.AgentData.AgentID = agentID;
11615 11615
11616 packet.Rights = new ChangeUserRightsPacket.RightsBlock[1]; 11616 packet.Rights = new ChangeUserRightsPacket.RightsBlock[1];
11617 packet.Rights[0] = new ChangeUserRightsPacket.RightsBlock(); 11617 packet.Rights[0] = new ChangeUserRightsPacket.RightsBlock();
diff --git a/OpenSim/Region/Examples/SimpleModule/MyNpcCharacter.cs b/OpenSim/Region/Examples/SimpleModule/MyNpcCharacter.cs
index c5b2363..a1957d1 100644
--- a/OpenSim/Region/Examples/SimpleModule/MyNpcCharacter.cs
+++ b/OpenSim/Region/Examples/SimpleModule/MyNpcCharacter.cs
@@ -1150,7 +1150,7 @@ namespace OpenSim.Region.Examples.SimpleModule
1150 { 1150 {
1151 } 1151 }
1152 1152
1153 public void SendChangeUserRights(UUID friendID, int rights) 1153 public void SendChangeUserRights(UUID agentID, UUID friendID, int rights)
1154 { 1154 {
1155 } 1155 }
1156 } 1156 }
diff --git a/OpenSim/Region/OptionalModules/Agent/InternetRelayClientView/Server/IRCClientView.cs b/OpenSim/Region/OptionalModules/Agent/InternetRelayClientView/Server/IRCClientView.cs
index cbe3c77..96530a1 100644
--- a/OpenSim/Region/OptionalModules/Agent/InternetRelayClientView/Server/IRCClientView.cs
+++ b/OpenSim/Region/OptionalModules/Agent/InternetRelayClientView/Server/IRCClientView.cs
@@ -1676,7 +1676,7 @@ namespace OpenSim.Region.OptionalModules.Agent.InternetRelayClientView.Server
1676 { 1676 {
1677 } 1677 }
1678 1678
1679 public void SendChangeUserRights(UUID friendID, int rights) 1679 public void SendChangeUserRights(UUID agentID, UUID friendID, int rights)
1680 { 1680 {
1681 } 1681 }
1682 } 1682 }
diff --git a/OpenSim/Region/OptionalModules/World/NPC/NPCAvatar.cs b/OpenSim/Region/OptionalModules/World/NPC/NPCAvatar.cs
index 7987929..f8ab8d8 100644
--- a/OpenSim/Region/OptionalModules/World/NPC/NPCAvatar.cs
+++ b/OpenSim/Region/OptionalModules/World/NPC/NPCAvatar.cs
@@ -1156,7 +1156,7 @@ namespace OpenSim.Region.OptionalModules.World.NPC
1156 { 1156 {
1157 } 1157 }
1158 1158
1159 public void SendChangeUserRights(UUID friendID, int rights) 1159 public void SendChangeUserRights(UUID agentID, UUID friendID, int rights)
1160 { 1160 {
1161 } 1161 }
1162 } 1162 }
diff --git a/OpenSim/Tests/Common/Mock/TestClient.cs b/OpenSim/Tests/Common/Mock/TestClient.cs
index c424183..6403c1b 100644
--- a/OpenSim/Tests/Common/Mock/TestClient.cs
+++ b/OpenSim/Tests/Common/Mock/TestClient.cs
@@ -1210,7 +1210,7 @@ namespace OpenSim.Tests.Common.Mock
1210 { 1210 {
1211 } 1211 }
1212 1212
1213 public void SendChangeUserRights(UUID friendID, int rights) 1213 public void SendChangeUserRights(UUID agentID, UUID friendID, int rights)
1214 { 1214 {
1215 } 1215 }
1216 } 1216 }