diff options
author | Melanie | 2013-02-26 13:34:20 +0000 |
---|---|---|
committer | Melanie | 2013-02-26 13:34:20 +0000 |
commit | 54ee95dd8e6649723d92ac893e1699d34822cd80 (patch) | |
tree | d1d15e17c0a04bef247bfe8e6e0cffd3f8460ff1 /OpenSim/Addons/Groups/Service/GroupsService.cs | |
parent | Make sure state machine is reset if crossing is aborted (diff) | |
parent | BulletSim: tweeks to make avatar jump work better. (diff) | |
download | opensim-SC-54ee95dd8e6649723d92ac893e1699d34822cd80.zip opensim-SC-54ee95dd8e6649723d92ac893e1699d34822cd80.tar.gz opensim-SC-54ee95dd8e6649723d92ac893e1699d34822cd80.tar.bz2 opensim-SC-54ee95dd8e6649723d92ac893e1699d34822cd80.tar.xz |
Merge branch 'master' into careminster
Diffstat (limited to '')
-rw-r--r-- | OpenSim/Addons/Groups/Service/GroupsService.cs | 6 |
1 files changed, 6 insertions, 0 deletions
diff --git a/OpenSim/Addons/Groups/Service/GroupsService.cs b/OpenSim/Addons/Groups/Service/GroupsService.cs index fc567dd..0668870 100644 --- a/OpenSim/Addons/Groups/Service/GroupsService.cs +++ b/OpenSim/Addons/Groups/Service/GroupsService.cs | |||
@@ -785,10 +785,16 @@ namespace OpenSim.Groups | |||
785 | RoleData data = m_Database.RetrieveRole(groupID, roleID); | 785 | RoleData data = m_Database.RetrieveRole(groupID, roleID); |
786 | 786 | ||
787 | if (add && data != null) // it already exists, can't create | 787 | if (add && data != null) // it already exists, can't create |
788 | { | ||
789 | m_log.DebugFormat("[Groups]: Group {0} already exists. Can't create it again", groupID); | ||
788 | return false; | 790 | return false; |
791 | } | ||
789 | 792 | ||
790 | if (!add && data == null) // it deosn't exist, can't update | 793 | if (!add && data == null) // it deosn't exist, can't update |
794 | { | ||
795 | m_log.DebugFormat("[Groups]: Group {0} doesn't exist. Can't update it", groupID); | ||
791 | return false; | 796 | return false; |
797 | } | ||
792 | 798 | ||
793 | if (add) | 799 | if (add) |
794 | data = new RoleData(); | 800 | data = new RoleData(); |