From 25fea820490603227432639dde1305957555abb2 Mon Sep 17 00:00:00 2001
From: Diva Canto
Date: Mon, 13 May 2013 07:29:17 -0700
Subject: Fixes mantis #6636 -- Groups

---
 OpenSim/Addons/Groups/Hypergrid/GroupsServiceHGConnectorModule.cs | 1 -
 OpenSim/Addons/Groups/Service/GroupsService.cs                    | 7 +++++++
 2 files changed, 7 insertions(+), 1 deletion(-)

(limited to 'OpenSim/Addons/Groups')

diff --git a/OpenSim/Addons/Groups/Hypergrid/GroupsServiceHGConnectorModule.cs b/OpenSim/Addons/Groups/Hypergrid/GroupsServiceHGConnectorModule.cs
index f670272..7e0b112 100644
--- a/OpenSim/Addons/Groups/Hypergrid/GroupsServiceHGConnectorModule.cs
+++ b/OpenSim/Addons/Groups/Hypergrid/GroupsServiceHGConnectorModule.cs
@@ -186,7 +186,6 @@ namespace OpenSim.Groups
         public UUID CreateGroup(UUID RequestingAgentID, string name, string charter, bool showInList, UUID insigniaID, int membershipFee, bool openEnrollment, 
             bool allowPublish, bool maturePublish, UUID founderID, out string reason)
         {
-            m_log.DebugFormat("[Groups]: Creating group {0}", name);
             reason = string.Empty;
             if (m_UserManagement.IsLocalGridUser(RequestingAgentID))
                 return m_LocalGroupsConnector.CreateGroup(RequestingAgentID, name, charter, showInList, insigniaID, 
diff --git a/OpenSim/Addons/Groups/Service/GroupsService.cs b/OpenSim/Addons/Groups/Service/GroupsService.cs
index 6a4348b..a2ef13a 100644
--- a/OpenSim/Addons/Groups/Service/GroupsService.cs
+++ b/OpenSim/Addons/Groups/Service/GroupsService.cs
@@ -130,6 +130,13 @@ namespace OpenSim.Groups
         {
             reason = string.Empty;
 
+            // Check if the group already exists
+            if (m_Database.RetrieveGroup(name) != null)
+            {
+                reason = "A group with that name already exists";
+                return UUID.Zero;
+            }
+
             // Create the group
             GroupData data = new GroupData();
             data.GroupID = UUID.Random();
-- 
cgit v1.1