Merge branch 'master' into httptests

2 files changed, 4 insertions, 1 deletions

diff --git a/OpenSim/Addons/Groups/GroupsMessagingModule.cs b/OpenSim/Addons/Groups/GroupsMessagingModule.cs
index e95db41..2ec9652 100644
--- a/OpenSim/Addons/Groups/GroupsMessagingModule.cs
+++ b/OpenSim/Addons/Groups/GroupsMessagingModule.cs
@@ -627,6 +627,7 @@ namespace OpenSim.Groups
                         , false //canVoiceChat
                         , false //isModerator
                         , false //text mute
+                        , true // Enter
                         );
                 }
             }
@@ -669,6 +670,7 @@ namespace OpenSim.Groups
                         , false //canVoiceChat
                         , false //isModerator
                         , false //text mute
+                        , true
                         );
                 }
             }
diff --git a/OpenSim/Addons/Groups/GroupsModule.cs b/OpenSim/Addons/Groups/GroupsModule.cs
index 1afdd0f..e586dd7 100644
--- a/OpenSim/Addons/Groups/GroupsModule.cs
+++ b/OpenSim/Addons/Groups/GroupsModule.cs
@@ -249,7 +249,8 @@ namespace OpenSim.Groups
             // There might be some problem with the thread we're generating this on but not
             //   doing the update at this time causes problems (Mantis #7920 and #7915)
             // TODO: move sending this update to a later time in the rootification of the client.
-            SendAgentGroupDataUpdate(sp.ControllingClient, false);
+            if(!sp.haveGroupInformation)
+                SendAgentGroupDataUpdate(sp.ControllingClient, false);
         }
 
         private void OnMakeChild(ScenePresence sp)