diff --git a/OpenSim/Client/MXP/ClientStack/MXPClientView.cs b/OpenSim/Client/MXP/ClientStack/MXPClientView.cs
index b40a09b659..cf87a30b94 100644
--- a/OpenSim/Client/MXP/ClientStack/MXPClientView.cs
+++ b/OpenSim/Client/MXP/ClientStack/MXPClientView.cs
@@ -1707,7 +1707,7 @@ namespace OpenSim.Client.MXP.ClientStack
         {
         }
 
-        public void SendChangeUserRights(UUID friendID, int rights)
+        public void SendChangeUserRights(UUID agentID, UUID friendID, int rights)
         {
         }
     }
diff --git a/OpenSim/Client/Sirikata/ClientStack/SirikataClientView.cs b/OpenSim/Client/Sirikata/ClientStack/SirikataClientView.cs
index 22a37d18f7..56f5f8f426 100644
--- a/OpenSim/Client/Sirikata/ClientStack/SirikataClientView.cs
+++ b/OpenSim/Client/Sirikata/ClientStack/SirikataClientView.cs
@@ -1195,7 +1195,7 @@ namespace OpenSim.Client.Sirikata.ClientStack
         {
         }
 
-        public void SendChangeUserRights(UUID friendID, int rights)
+        public void SendChangeUserRights(UUID agentID, UUID friendID, int rights)
         {
         }
 
diff --git a/OpenSim/Client/VWoHTTP/ClientStack/VWHClientView.cs b/OpenSim/Client/VWoHTTP/ClientStack/VWHClientView.cs
index 2630774178..b8f46dc647 100644
--- a/OpenSim/Client/VWoHTTP/ClientStack/VWHClientView.cs
+++ b/OpenSim/Client/VWoHTTP/ClientStack/VWHClientView.cs
@@ -1211,7 +1211,7 @@ namespace OpenSim.Client.VWoHTTP.ClientStack
         {
         }
 
-        public void SendChangeUserRights(UUID friendID, int rights)
+        public void SendChangeUserRights(UUID agentID, UUID friendID, int rights)
         {
         }
     }
diff --git a/OpenSim/Framework/IClientAPI.cs b/OpenSim/Framework/IClientAPI.cs
index 1daca320c8..82b596821c 100644
--- a/OpenSim/Framework/IClientAPI.cs
+++ b/OpenSim/Framework/IClientAPI.cs
@@ -1478,6 +1478,6 @@ namespace OpenSim.Framework
         
         void SendGroupTransactionsSummaryDetails(IClientAPI sender,UUID groupID, UUID transactionID, UUID sessionID,int amt);
         
-        void SendChangeUserRights(UUID friendID, int rights);
+        void SendChangeUserRights(UUID agentID, UUID friendID, int rights);
     }
 }
diff --git a/OpenSim/Region/ClientStack/LindenUDP/LLClientView.cs b/OpenSim/Region/ClientStack/LindenUDP/LLClientView.cs
index 84482361d0..ef492052fc 100644
--- a/OpenSim/Region/ClientStack/LindenUDP/LLClientView.cs
+++ b/OpenSim/Region/ClientStack/LindenUDP/LLClientView.cs
@@ -11606,12 +11606,12 @@ namespace OpenSim.Region.ClientStack.LindenUDP
             OutPacket(packet, ThrottleOutPacketType.Task);
         }
 
-        public void SendChangeUserRights(UUID friendID, int rights)
+        public void SendChangeUserRights(UUID agentID, UUID friendID, int rights)
         {
             ChangeUserRightsPacket packet = (ChangeUserRightsPacket)PacketPool.Instance.GetPacket(PacketType.ChangeUserRights);
 
             packet.AgentData = new ChangeUserRightsPacket.AgentDataBlock();
-            packet.AgentData.AgentID = AgentId;
+            packet.AgentData.AgentID = agentID;
 
             packet.Rights = new ChangeUserRightsPacket.RightsBlock[1];
             packet.Rights[0] = new ChangeUserRightsPacket.RightsBlock();
diff --git a/OpenSim/Region/Examples/SimpleModule/MyNpcCharacter.cs b/OpenSim/Region/Examples/SimpleModule/MyNpcCharacter.cs
index c5b23631cc..a1957d141b 100644
--- a/OpenSim/Region/Examples/SimpleModule/MyNpcCharacter.cs
+++ b/OpenSim/Region/Examples/SimpleModule/MyNpcCharacter.cs
@@ -1150,7 +1150,7 @@ namespace OpenSim.Region.Examples.SimpleModule
         {
         }
 
-        public void SendChangeUserRights(UUID friendID, int rights)
+        public void SendChangeUserRights(UUID agentID, UUID friendID, int rights)
         {
         }
     }
diff --git a/OpenSim/Region/OptionalModules/Agent/InternetRelayClientView/Server/IRCClientView.cs b/OpenSim/Region/OptionalModules/Agent/InternetRelayClientView/Server/IRCClientView.cs
index cbe3c77fa1..96530a1f01 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
         {
         }
 
-        public void SendChangeUserRights(UUID friendID, int rights)
+        public void SendChangeUserRights(UUID agentID, UUID friendID, int rights)
         {
         }
     }
diff --git a/OpenSim/Region/OptionalModules/World/NPC/NPCAvatar.cs b/OpenSim/Region/OptionalModules/World/NPC/NPCAvatar.cs
index 798792981c..f8ab8d8bc1 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
         {
         }
 
-        public void SendChangeUserRights(UUID friendID, int rights)
+        public void SendChangeUserRights(UUID agentID, UUID friendID, int rights)
         {
         }
     }
diff --git a/OpenSim/Tests/Common/Mock/TestClient.cs b/OpenSim/Tests/Common/Mock/TestClient.cs
index c42418388d..6403c1bfe3 100644
--- a/OpenSim/Tests/Common/Mock/TestClient.cs
+++ b/OpenSim/Tests/Common/Mock/TestClient.cs
@@ -1210,7 +1210,7 @@ namespace OpenSim.Tests.Common.Mock
         {
         }
 
-        public void SendChangeUserRights(UUID friendID, int rights)
+        public void SendChangeUserRights(UUID agentID, UUID friendID, int rights)
         {
         }
     }