diff options
author | Melanie | 2013-08-01 01:23:24 +0100 |
---|---|---|
committer | Melanie | 2013-08-01 01:23:24 +0100 |
commit | 21f5e670303ee978c747567e674e5ebe256ad2c7 (patch) | |
tree | 19c3740cbb8bf78d038e64b2fb66ea837cc8f724 /OpenSim/Addons/Groups/GroupsModule.cs | |
parent | Merge branch 'master' into careminster (diff) | |
parent | Include missing reference that probably stops windows build from commit 12995... (diff) | |
download | opensim-SC_OLD-21f5e670303ee978c747567e674e5ebe256ad2c7.zip opensim-SC_OLD-21f5e670303ee978c747567e674e5ebe256ad2c7.tar.gz opensim-SC_OLD-21f5e670303ee978c747567e674e5ebe256ad2c7.tar.bz2 opensim-SC_OLD-21f5e670303ee978c747567e674e5ebe256ad2c7.tar.xz |
Merge branch 'master' into careminster
Conflicts:
OpenSim/Region/ClientStack/Linden/Caps/GetTextureModule.cs
Diffstat (limited to 'OpenSim/Addons/Groups/GroupsModule.cs')
-rw-r--r-- | OpenSim/Addons/Groups/GroupsModule.cs | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/OpenSim/Addons/Groups/GroupsModule.cs b/OpenSim/Addons/Groups/GroupsModule.cs index 826fcbf..da8030c 100644 --- a/OpenSim/Addons/Groups/GroupsModule.cs +++ b/OpenSim/Addons/Groups/GroupsModule.cs | |||
@@ -991,6 +991,10 @@ namespace OpenSim.Groups | |||
991 | 991 | ||
992 | // Should this send updates to everyone in the group? | 992 | // Should this send updates to everyone in the group? |
993 | SendAgentGroupDataUpdate(remoteClient, GetRequestingAgentID(remoteClient)); | 993 | SendAgentGroupDataUpdate(remoteClient, GetRequestingAgentID(remoteClient)); |
994 | |||
995 | if (reason != string.Empty) | ||
996 | // A warning | ||
997 | remoteClient.SendAlertMessage("Warning: " + reason); | ||
994 | } | 998 | } |
995 | else | 999 | else |
996 | remoteClient.SendJoinGroupReply(groupID, false); | 1000 | remoteClient.SendJoinGroupReply(groupID, false); |