5 files changed, 47 insertions, 0 deletions

diff --git a/OpenSim/Framework/IClientAPI.cs b/OpenSim/Framework/IClientAPI.cs
index b32c7f6..8d9cdaa 100644
--- a/OpenSim/Framework/IClientAPI.cs
+++ b/OpenSim/Framework/IClientAPI.cs
@@ -496,6 +496,8 @@ namespace OpenSim.Framework
 
         ulong GetGroupPowers(UUID groupID);
 
+        bool IsGroupMember(UUID GroupID);
+
         string FirstName { get; }
 
         string LastName { get; }
diff --git a/OpenSim/Region/ClientStack/LindenUDP/LLClientView.cs b/OpenSim/Region/ClientStack/LindenUDP/LLClientView.cs
index a897aa2..0b905df 100644
--- a/OpenSim/Region/ClientStack/LindenUDP/LLClientView.cs
+++ b/OpenSim/Region/ClientStack/LindenUDP/LLClientView.cs
@@ -317,8 +317,16 @@ namespace OpenSim.Region.ClientStack.LindenUDP
             get { return m_activeGroupPowers; }
         }
 
+        public bool IsGroupMember(UUID groupID)
+        {
+            return m_groupPowers.ContainsKey(groupID);
+        }
+
         public ulong GetGroupPowers(UUID groupID)
         {
+            if (groupID == m_activeGroupID)
+                return m_activeGroupPowers;
+
             if (m_groupPowers.ContainsKey(groupID))
                 return m_groupPowers[groupID];
             return 0;
@@ -750,6 +758,8 @@ namespace OpenSim.Region.ClientStack.LindenUDP
             m_clientPingTimer.Enabled = true;
 
             m_scene.AddNewClient(this, true);
+
+            RefreshGroupMembership();
         }
 
         /// <summary>
@@ -7129,10 +7139,14 @@ namespace OpenSim.Region.ClientStack.LindenUDP
 
         public void SendGroupMembership(GroupMembershipData[] GroupMembership)
         {
+            m_groupPowers.Clear();
+
             AgentGroupDataUpdatePacket Groupupdate = new AgentGroupDataUpdatePacket();
             AgentGroupDataUpdatePacket.GroupDataBlock[] Groups = new AgentGroupDataUpdatePacket.GroupDataBlock[GroupMembership.Length];
             for (int i = 0; i < GroupMembership.Length; i++)
             {
+                m_groupPowers[GroupMembership[i].GroupID] = GroupMembership[i].GroupPowers;
+
                 AgentGroupDataUpdatePacket.GroupDataBlock Group = new AgentGroupDataUpdatePacket.GroupDataBlock();
                 Group.AcceptNotices = GroupMembership[i].AcceptNotices;
                 Group.Contribution = GroupMembership[i].Contribution;
@@ -7850,5 +7864,21 @@ namespace OpenSim.Region.ClientStack.LindenUDP
         }
 
         #endregion
+
+        private void RefreshGroupMembership()
+        {
+            if (m_GroupsModule != null)
+            {
+                GroupMembershipData[] GroupMembership =
+                        m_GroupsModule.GetMembershipData(AgentId);
+
+                m_groupPowers.Clear();
+
+                for (int i = 0; i < GroupMembership.Length; i++)
+                {
+                    m_groupPowers[GroupMembership[i].GroupID] = GroupMembership[i].GroupPowers;
+                }
+            }
+        }
     }
 }
diff --git a/OpenSim/Region/Environment/Modules/World/NPC/NPCAvatar.cs b/OpenSim/Region/Environment/Modules/World/NPC/NPCAvatar.cs
index f243987..0a27086 100644
--- a/OpenSim/Region/Environment/Modules/World/NPC/NPCAvatar.cs
+++ b/OpenSim/Region/Environment/Modules/World/NPC/NPCAvatar.cs
@@ -413,6 +413,11 @@ namespace OpenSim.Region.Environment.Modules.World.NPC
             get { return 0; }
         }
 
+        public bool IsGroupMember(UUID groupID)
+        {
+            return false;
+        }
+
         public ulong GetGroupPowers(UUID groupID)
         {
             return 0;
diff --git a/OpenSim/Region/Environment/Scenes/Tests/TestClient.cs b/OpenSim/Region/Environment/Scenes/Tests/TestClient.cs
index 15c6ad1..392a53b 100644
--- a/OpenSim/Region/Environment/Scenes/Tests/TestClient.cs
+++ b/OpenSim/Region/Environment/Scenes/Tests/TestClient.cs
@@ -301,6 +301,11 @@ namespace OpenSim.Region.Environment.Scenes.Tests
             get { return 0; }
         }
 
+        public bool IsGroupMember(UUID groupID)
+        {
+            return false;
+        }
+
         public ulong GetGroupPowers(UUID groupID)
         {
             return 0;
diff --git a/OpenSim/Region/Examples/SimpleModule/MyNpcCharacter.cs b/OpenSim/Region/Examples/SimpleModule/MyNpcCharacter.cs
index e05ccd1..b5ab1ac 100644
--- a/OpenSim/Region/Examples/SimpleModule/MyNpcCharacter.cs
+++ b/OpenSim/Region/Examples/SimpleModule/MyNpcCharacter.cs
@@ -311,6 +311,11 @@ namespace OpenSim.Region.Examples.SimpleModule
             get { return 0; }
         }
 
+        public bool IsGroupMember(UUID groupID)
+        {
+            return false;
+        }
+
         public ulong GetGroupPowers(UUID groupID)
         {
             return 0;