5 files changed, 580 insertions, 15 deletions

diff --git a/OpenSim/Services/Connectors/Authorization/AuthorizationServiceConnector.cs b/OpenSim/Services/Connectors/Authorization/AuthorizationServiceConnector.cs
index a1c032e..4eb4bd2 100644
--- a/OpenSim/Services/Connectors/Authorization/AuthorizationServiceConnector.cs
+++ b/OpenSim/Services/Connectors/Authorization/AuthorizationServiceConnector.cs
@@ -67,7 +67,7 @@ namespace OpenSim.Services.Connectors
             IConfig authorizationConfig = source.Configs["AuthorizationService"];
             if (authorizationConfig == null)
             {
-                m_log.Info("[AUTHORIZATION CONNECTOR]: AuthorizationService missing from OpenSim.ini");
+                //m_log.Info("[AUTHORIZATION CONNECTOR]: AuthorizationService missing from OpenSim.ini");
                 throw new Exception("Authorization connector init error");
             }
 
@@ -86,6 +86,7 @@ namespace OpenSim.Services.Connectors
             bool responseOnFailure = authorizationConfig.GetBoolean("ResponseOnFailure",true);
                     
             m_ResponseOnFailure = responseOnFailure;
+            m_log.Info("[AUTHORIZATION CONNECTOR]: AuthorizationService initialized");
         }
 
         public bool IsAuthorizedForRegion(string userID, string firstname, string surname, string email, string regionName, string regionID, out string message)
diff --git a/OpenSim/Services/Connectors/Grid/GridServiceConnector.cs b/OpenSim/Services/Connectors/Grid/GridServiceConnector.cs
index cf112e1..a1ca58e 100644
--- a/OpenSim/Services/Connectors/Grid/GridServiceConnector.cs
+++ b/OpenSim/Services/Connectors/Grid/GridServiceConnector.cs
@@ -86,7 +86,7 @@ namespace OpenSim.Services.Connectors
 
         #region IGridService
 
-        public virtual bool RegisterRegion(UUID scopeID, GridRegion regionInfo)
+        public virtual string RegisterRegion(UUID scopeID, GridRegion regionInfo)
         {
             Dictionary<string, object> rinfo = regionInfo.ToKeyValuePairs();
             Dictionary<string, object> sendData = new Dictionary<string,object>();
@@ -110,11 +110,23 @@ namespace OpenSim.Services.Connectors
                     Dictionary<string, object> replyData = ServerUtils.ParseXmlResponse(reply);
 
                     if (replyData.ContainsKey("Result")&& (replyData["Result"].ToString().ToLower() == "success"))
-                        return true;
+                    {
+                        return String.Empty;
+                    }
+                    else if (replyData.ContainsKey("Result")&& (replyData["Result"].ToString().ToLower() == "failure"))
+                    {
+                        m_log.DebugFormat("[GRID CONNECTOR]: Registration failed: {0}", replyData["Message"].ToString());
+                        return replyData["Message"].ToString();
+                    }
                     else if (!replyData.ContainsKey("Result"))
+                    {
                         m_log.DebugFormat("[GRID CONNECTOR]: reply data does not contain result field");
+                    }
                     else
+                    {
                         m_log.DebugFormat("[GRID CONNECTOR]: unexpected result {0}", replyData["Result"].ToString());
+                        return "Unexpected result "+replyData["Result"].ToString();
+                    }
                     
                 }
                 else
@@ -125,7 +137,7 @@ namespace OpenSim.Services.Connectors
                 m_log.DebugFormat("[GRID CONNECTOR]: Exception when contacting grid server: {0}", e.Message);
             }
 
-            return false;
+            return "Error communicating with grid service";
         }
 
         public virtual bool DeregisterRegion(UUID regionID)
diff --git a/OpenSim/Services/Connectors/Inventory/XInventoryConnector.cs b/OpenSim/Services/Connectors/Inventory/XInventoryConnector.cs
new file mode 100644
index 0000000..b9ccd7e
--- /dev/null
+++ b/OpenSim/Services/Connectors/Inventory/XInventoryConnector.cs
@@ -0,0 +1,535 @@
+/*
+ * Copyright (c) Contributors, http://opensimulator.org/
+ * See CONTRIBUTORS.TXT for a full list of copyright holders.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions are met:
+ *     * Redistributions of source code must retain the above copyright
+ *       notice, this list of conditions and the following disclaimer.
+ *     * Redistributions in binary form must reproduce the above copyright
+ *       notice, this list of conditions and the following disclaimer in the
+ *       documentation and/or other materials provided with the distribution.
+ *     * Neither the name of the OpenSimulator Project nor the
+ *       names of its contributors may be used to endorse or promote products
+ *       derived from this software without specific prior written permission.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE DEVELOPERS ``AS IS'' AND ANY
+ * EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
+ * WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
+ * DISCLAIMED. IN NO EVENT SHALL THE CONTRIBUTORS BE LIABLE FOR ANY
+ * DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
+ * (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
+ * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
+ * ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+ * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
+ * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+ */
+
+using log4net;
+using System;
+using System.Collections.Generic;
+using System.IO;
+using System.Reflection;
+using Nini.Config;
+using OpenSim.Framework;
+using OpenSim.Framework.Console;
+using OpenSim.Framework.Communications;
+using OpenSim.Framework.Servers.HttpServer;
+using OpenSim.Services.Interfaces;
+using OpenSim.Server.Base;
+using OpenMetaverse;
+
+namespace OpenSim.Services.Connectors
+{
+    public class XInventoryServicesConnector : IInventoryService
+    {
+        private static readonly ILog m_log =
+                LogManager.GetLogger(
+                MethodBase.GetCurrentMethod().DeclaringType);
+
+        private string m_ServerURI = String.Empty;
+
+        public XInventoryServicesConnector()
+        {
+        }
+
+        public XInventoryServicesConnector(string serverURI)
+        {
+            m_ServerURI = serverURI.TrimEnd('/');
+        }
+
+        public XInventoryServicesConnector(IConfigSource source)
+        {
+            Initialise(source);
+        }
+
+        public virtual void Initialise(IConfigSource source)
+        {
+            IConfig assetConfig = source.Configs["InventoryService"];
+            if (assetConfig == null)
+            {
+                m_log.Error("[INVENTORY CONNECTOR]: InventoryService missing from OpanSim.ini");
+                throw new Exception("Inventory connector init error");
+            }
+
+            string serviceURI = assetConfig.GetString("InventoryServerURI",
+                    String.Empty);
+
+            if (serviceURI == String.Empty)
+            {
+                m_log.Error("[INVENTORY CONNECTOR]: No Server URI named in section InventoryService");
+                throw new Exception("Inventory connector init error");
+            }
+            m_ServerURI = serviceURI;
+        }
+
+        public bool CreateUserInventory(UUID principalID)
+        {
+            Dictionary<string,object> ret = MakeRequest("CREATEUSERINVENTORY",
+                    new Dictionary<string,object> {
+                        { "PRINCIPAL", principalID.ToString() }
+                    });
+
+            if (ret == null)
+                return false;
+
+            return bool.Parse(ret["RESULT"].ToString());
+        }
+
+        public List<InventoryFolderBase> GetInventorySkeleton(UUID principalID)
+        {
+            Dictionary<string,object> ret = MakeRequest("GETINVENTORYSKELETON",
+                    new Dictionary<string,object> {
+                        { "PRINCIPAL", principalID.ToString() }
+                    });
+
+            if (ret == null)
+                return null;
+
+            List<InventoryFolderBase> folders = new List<InventoryFolderBase>();
+
+            foreach (Object o in ret.Values)
+                folders.Add(BuildFolder((Dictionary<string,object>)o));
+
+            return folders;
+        }
+
+        public InventoryFolderBase GetRootFolder(UUID principalID)
+        {
+            Dictionary<string,object> ret = MakeRequest("GETROOTFOLDER",
+                    new Dictionary<string,object> {
+                        { "PRINCIPAL", principalID.ToString() }
+                    });
+
+            if (ret == null)
+                return null;
+
+            if (ret.Count == 0)
+                return null;
+
+            return BuildFolder(ret);
+        }
+
+        public InventoryFolderBase GetFolderForType(UUID principalID, AssetType type)
+        {
+            Dictionary<string,object> ret = MakeRequest("GETFOLDERFORTYPE",
+                    new Dictionary<string,object> {
+                        { "PRINCIPAL", principalID.ToString() },
+                        { "TYPE", ((int)type).ToString() }
+                    });
+
+            if (ret == null)
+                return null;
+
+            if (ret.Count == 0)
+                return null;
+
+            return BuildFolder(ret);
+        }
+
+        public InventoryCollection GetFolderContent(UUID principalID, UUID folderID)
+        {
+            Dictionary<string,object> ret = MakeRequest("GETFOLDERCONTENT",
+                    new Dictionary<string,object> {
+                        { "PRINCIPAL", principalID.ToString() },
+                        { "FOLDER", folderID.ToString() }
+                    });
+
+            if (ret == null)
+                return null;
+
+            if (ret.Count == 0)
+                return null;
+
+            
+            InventoryCollection inventory = new InventoryCollection();
+            inventory.Folders = new List<InventoryFolderBase>();
+            inventory.Items = new List<InventoryItemBase>();
+            inventory.UserID = principalID;
+            
+            Dictionary<string,object> folders =
+                    (Dictionary<string,object>)ret["FOLDERS"];
+            Dictionary<string,object> items =
+                    (Dictionary<string,object>)ret["ITEMS"];
+
+            foreach (Object o in folders.Values)
+                inventory.Folders.Add(BuildFolder((Dictionary<string,object>)o));
+            foreach (Object o in items.Values)
+                inventory.Items.Add(BuildItem((Dictionary<string,object>)o));
+
+            return inventory;
+        }
+
+        public List<InventoryItemBase> GetFolderItems(UUID principalID, UUID folderID)
+        {
+            Dictionary<string,object> ret = MakeRequest("GETFOLDERCONTENT",
+                    new Dictionary<string,object> {
+                        { "PRINCIPAL", principalID.ToString() },
+                        { "FOLDER", folderID.ToString() }
+                    });
+
+            if (ret == null)
+                return null;
+
+            if (ret.Count == 0)
+                return null;
+
+            
+            List<InventoryItemBase> items = new List<InventoryItemBase>();
+            
+            foreach (Object o in ret.Values)
+                items.Add(BuildItem((Dictionary<string,object>)o));
+
+            return items;
+        }
+
+        public bool AddFolder(InventoryFolderBase folder)
+        {
+            Dictionary<string,object> ret = MakeRequest("ADDFOLDER",
+                    new Dictionary<string,object> {
+                        { "ParentID", folder.ParentID.ToString() },
+                        { "Type", folder.Type.ToString() },
+                        { "Version", folder.Version.ToString() },
+                        { "Name", folder.Name.ToString() },
+                        { "Owner", folder.Owner.ToString() },
+                        { "ID", folder.ID.ToString() }
+                    });
+
+            if (ret == null)
+                return false;
+
+            return bool.Parse(ret["RESULT"].ToString());
+        }
+
+        public bool UpdateFolder(InventoryFolderBase folder)
+        {
+            Dictionary<string,object> ret = MakeRequest("UPDATEFOLDER",
+                    new Dictionary<string,object> {
+                        { "ParentID", folder.ParentID.ToString() },
+                        { "Type", folder.Type.ToString() },
+                        { "Version", folder.Version.ToString() },
+                        { "Name", folder.Name.ToString() },
+                        { "Owner", folder.Owner.ToString() },
+                        { "ID", folder.ID.ToString() }
+                    });
+
+            if (ret == null)
+                return false;
+
+            return bool.Parse(ret["RESULT"].ToString());
+        }
+
+        public bool MoveFolder(InventoryFolderBase folder)
+        {
+            Dictionary<string,object> ret = MakeRequest("MOVEFOLDER",
+                    new Dictionary<string,object> {
+                        { "ParentID", folder.ParentID.ToString() },
+                        { "ID", folder.ID.ToString() }
+                    });
+
+            if (ret == null)
+                return false;
+
+            return bool.Parse(ret["RESULT"].ToString());
+        }
+
+        public bool DeleteFolders(UUID principalID, List<UUID> folderIDs)
+        {
+            List<string> slist = new List<string>();
+
+            foreach (UUID f in folderIDs)
+                slist.Add(f.ToString());
+
+            Dictionary<string,object> ret = MakeRequest("DELETEFOLDERS",
+                    new Dictionary<string,object> {
+                        { "PRINCIPAL", principalID.ToString() },
+                        { "FOLDERS", slist }
+                    });
+
+            if (ret == null)
+                return false;
+
+            return bool.Parse(ret["RESULT"].ToString());
+        }
+
+        public bool PurgeFolder(InventoryFolderBase folder)
+        {
+            Dictionary<string,object> ret = MakeRequest("PURGEFOLDER",
+                    new Dictionary<string,object> {
+                        { "ID", folder.ID.ToString() }
+                    });
+
+            if (ret == null)
+                return false;
+
+            return bool.Parse(ret["RESULT"].ToString());
+        }
+
+        public bool AddItem(InventoryItemBase item)
+        {
+            Dictionary<string,object> ret = MakeRequest("ADDITEM",
+                    new Dictionary<string,object> {
+                        { "AssetID", item.AssetID.ToString() },
+                        { "AssetType", item.AssetType.ToString() },
+                        { "Name", item.Name.ToString() },
+                        { "Owner", item.Owner.ToString() },
+                        { "ID", item.ID.ToString() },
+                        { "InvType", item.InvType.ToString() },
+                        { "Folder", item.Folder.ToString() },
+                        { "CreatorId", item.CreatorId.ToString() },
+                        { "Description", item.Description.ToString() },
+                        { "NextPermissions", item.NextPermissions.ToString() },
+                        { "CurrentPermissions", item.CurrentPermissions.ToString() },
+                        { "BasePermissions", item.BasePermissions.ToString() },
+                        { "EveryOnePermissions", item.EveryOnePermissions.ToString() },
+                        { "GroupPermissions", item.GroupPermissions.ToString() },
+                        { "GroupID", item.GroupID.ToString() },
+                        { "GroupOwned", item.GroupOwned.ToString() },
+                        { "SalePrice", item.SalePrice.ToString() },
+                        { "SaleType", item.SaleType.ToString() },
+                        { "Flags", item.Flags.ToString() },
+                        { "CreationDate", item.CreationDate.ToString() }
+                    });
+
+            if (ret == null)
+                return false;
+
+            return bool.Parse(ret["RESULT"].ToString());
+        }
+
+        public bool UpdateItem(InventoryItemBase item)
+        {
+            Dictionary<string,object> ret = MakeRequest("UPDATEITEM",
+                    new Dictionary<string,object> {
+                        { "AssetID", item.AssetID.ToString() },
+                        { "AssetType", item.AssetType.ToString() },
+                        { "Name", item.Name.ToString() },
+                        { "Owner", item.Owner.ToString() },
+                        { "ID", item.ID.ToString() },
+                        { "InvType", item.InvType.ToString() },
+                        { "Folder", item.Folder.ToString() },
+                        { "CreatorId", item.CreatorId.ToString() },
+                        { "Description", item.Description.ToString() },
+                        { "NextPermissions", item.NextPermissions.ToString() },
+                        { "CurrentPermissions", item.CurrentPermissions.ToString() },
+                        { "BasePermissions", item.BasePermissions.ToString() },
+                        { "EveryOnePermissions", item.EveryOnePermissions.ToString() },
+                        { "GroupPermissions", item.GroupPermissions.ToString() },
+                        { "GroupID", item.GroupID.ToString() },
+                        { "GroupOwned", item.GroupOwned.ToString() },
+                        { "SalePrice", item.SalePrice.ToString() },
+                        { "SaleType", item.SaleType.ToString() },
+                        { "Flags", item.Flags.ToString() },
+                        { "CreationDate", item.CreationDate.ToString() }
+                    });
+
+            if (ret == null)
+                return false;
+
+            return bool.Parse(ret["RESULT"].ToString());
+        }
+
+        public bool MoveItems(UUID principalID, List<InventoryItemBase> items)
+        {
+            List<string> idlist = new List<string>();
+            List<string> destlist = new List<string>();
+
+            foreach (InventoryItemBase item in items)
+            {
+                idlist.Add(item.ID.ToString());
+                destlist.Add(item.Folder.ToString());
+            }
+
+            Dictionary<string,object> ret = MakeRequest("MOVEITEMS",
+                    new Dictionary<string,object> {
+                        { "PrincipalID", principalID.ToString() },
+                        { "IDLIST", idlist },
+                        { "DESTLIST", destlist }
+                    });
+
+            if (ret == null)
+                return false;
+
+            return bool.Parse(ret["RESULT"].ToString());
+        }
+
+        public bool DeleteItems(UUID principalID, List<UUID> itemIDs)
+        {
+            List<string> slist = new List<string>();
+
+            foreach (UUID f in itemIDs)
+                slist.Add(f.ToString());
+
+            Dictionary<string,object> ret = MakeRequest("DELETEITEMS",
+                    new Dictionary<string,object> {
+                        { "PRINCIPAL", principalID.ToString() },
+                        { "ITEMS", slist }
+                    });
+
+            if (ret == null)
+                return false;
+
+            return bool.Parse(ret["RESULT"].ToString());
+        }
+
+        public InventoryItemBase GetItem(InventoryItemBase item)
+        {
+            Dictionary<string,object> ret = MakeRequest("GETITEM",
+                    new Dictionary<string,object> {
+                        { "ID", item.ID.ToString() }
+                    });
+
+            if (ret == null)
+                return null;
+
+            if (ret.Count == 0)
+                return null;
+
+            return BuildItem(ret);
+        }
+
+        public InventoryFolderBase GetFolder(InventoryFolderBase folder)
+        {
+            Dictionary<string,object> ret = MakeRequest("GETFOLDER",
+                    new Dictionary<string,object> {
+                        { "ID", folder.ID.ToString() }
+                    });
+
+            if (ret == null)
+                return null;
+
+            if (ret.Count == 0)
+                return null;
+
+            return BuildFolder(ret);
+        }
+
+        public List<InventoryItemBase> GetActiveGestures(UUID principalID)
+        {
+            Dictionary<string,object> ret = MakeRequest("GETACTIVEGESTURES",
+                    new Dictionary<string,object> {
+                        { "PRINCIPAL", principalID.ToString() }
+                    });
+
+            if (ret == null)
+                return null;
+
+            List<InventoryItemBase> items = new List<InventoryItemBase>();
+
+            foreach (Object o in ret.Values)
+                items.Add(BuildItem((Dictionary<string,object>)o));
+
+            return items;
+        }
+
+        public int GetAssetPermissions(UUID principalID, UUID assetID)
+        {
+            Dictionary<string,object> ret = MakeRequest("GETASSETPERMISSIONS",
+                    new Dictionary<string,object> {
+                        { "PRINCIPAL", principalID.ToString() },
+                        { "ASSET", assetID.ToString() }
+                    });
+
+            if (ret == null)
+                return 0;
+
+            return int.Parse(ret["RESULT"].ToString());
+        }
+
+
+        // These are either obsolete or unused
+        //
+        public InventoryCollection GetUserInventory(UUID principalID)
+        {
+            return null;
+        }
+
+        public void GetUserInventory(UUID principalID, InventoryReceiptCallback callback)
+        {
+        }
+
+        public bool HasInventoryForUser(UUID principalID)
+        {
+            return false;
+        }
+
+        // Helpers
+        //
+        private Dictionary<string,object> MakeRequest(string method,
+                Dictionary<string,object> sendData)
+        {
+            sendData["METHOD"] = method;
+
+            string reply = SynchronousRestFormsRequester.MakeRequest("POST",
+                    m_ServerURI + "/xinventory",
+                    ServerUtils.BuildQueryString(sendData));
+
+            Dictionary<string, object> replyData = ServerUtils.ParseXmlResponse(
+                    reply);
+
+            return replyData;
+        }
+
+        private InventoryFolderBase BuildFolder(Dictionary<string,object> data)
+        {
+            InventoryFolderBase folder = new InventoryFolderBase();
+
+            folder.ParentID =  new UUID(data["ParentID"].ToString());
+            folder.Type = short.Parse(data["Type"].ToString());
+            folder.Version = ushort.Parse(data["Version"].ToString());
+            folder.Name = data["Name"].ToString();
+            folder.Owner =  new UUID(data["Owner"].ToString());
+            folder.ID = new UUID(data["ID"].ToString());
+            
+            return folder;
+        }
+
+        private InventoryItemBase BuildItem(Dictionary<string,object> data)
+        {
+            InventoryItemBase item = new InventoryItemBase();
+
+            item.AssetID = new UUID(data["AssetID"].ToString());
+            item.AssetType = int.Parse(data["AssetType"].ToString());
+            item.Name = data["Name"].ToString();
+            item.Owner = new UUID(data["Owner"].ToString());
+            item.ID = new UUID(data["ID"].ToString());
+            item.InvType = int.Parse(data["InvType"].ToString());
+            item.Folder = new UUID(data["Folder"].ToString());
+            item.CreatorId = data["CreatorId"].ToString();
+            item.Description = data["Description"].ToString();
+            item.NextPermissions = uint.Parse(data["NextPermissions"].ToString());
+            item.CurrentPermissions = uint.Parse(data["CurrentPermissions"].ToString());
+            item.BasePermissions = uint.Parse(data["BasePermissions"].ToString());
+            item.EveryOnePermissions = uint.Parse(data["EveryOnePermissions"].ToString());
+            item.GroupPermissions = uint.Parse(data["GroupPermissions"].ToString());
+            item.GroupID = new UUID(data["GroupID"].ToString());
+            item.GroupOwned = bool.Parse(data["GroupOwned"].ToString());
+            item.SalePrice = int.Parse(data["SalePrice"].ToString());
+            item.SaleType = byte.Parse(data["SaleType"].ToString());
+            item.Flags = uint.Parse(data["Flags"].ToString());
+            item.CreationDate = int.Parse(data["CreationDate"].ToString());
+
+            return item;
+        }
+    }
+}
diff --git a/OpenSim/Services/GridService/GridService.cs b/OpenSim/Services/GridService/GridService.cs
index 5c55c0b..e912705 100644
--- a/OpenSim/Services/GridService/GridService.cs
+++ b/OpenSim/Services/GridService/GridService.cs
@@ -52,6 +52,7 @@ namespace OpenSim.Services.GridService
         protected IConfigSource m_config;
 
         protected IAuthenticationService m_AuthenticationService = null;
+        protected bool m_AllowDuplicateNames = false;
 
         public GridService(IConfigSource config)
             : base(config)
@@ -71,6 +72,7 @@ namespace OpenSim.Services.GridService
                     Object[] args = new Object[] { config };
                     m_AuthenticationService = ServerUtils.LoadPlugin<IAuthenticationService>(authService, args);
                 }
+                m_AllowDuplicateNames = gridConfig.GetBoolean("AllowDuplicateNames", m_AllowDuplicateNames);
             }
             
             if (m_RootInstance == null)
@@ -95,7 +97,7 @@ namespace OpenSim.Services.GridService
 
         #region IGridService
 
-        public bool RegisterRegion(UUID scopeID, GridRegion regionInfos)
+        public string RegisterRegion(UUID scopeID, GridRegion regionInfos)
         {
             IConfig gridConfig = m_config.Configs["GridService"];
             // This needs better sanity testing. What if regionInfo is registering in
@@ -116,7 +118,7 @@ namespace OpenSim.Services.GridService
                     // Regions reserved for the null key cannot be taken.
                     //
                     if (region.Data["PrincipalID"] == UUID.Zero.ToString())
-                        return false;
+                        return "Region location us reserved";
 
                     // Treat it as an auth request
                     //
@@ -132,12 +134,10 @@ namespace OpenSim.Services.GridService
                     // Can we authenticate at all?
                     //
                     if (m_AuthenticationService == null)
-                        return false;
+                        return "No authentication possible";
 
                     if (!m_AuthenticationService.Verify(new UUID(region.Data["PrincipalID"].ToString()), regionInfos.Token, 30))
-                        return false;
-
-                    return false;
+                        return "Bad authentication";
                 }
             }
 
@@ -145,13 +145,13 @@ namespace OpenSim.Services.GridService
             {
                 m_log.WarnFormat("[GRID SERVICE]: Region {0} tried to register in coordinates {1}, {2} which are already in use in scope {3}.", 
                     regionInfos.RegionID, regionInfos.RegionLocX, regionInfos.RegionLocY, scopeID);
-                return false;
+                return "Region overlaps another region";
             }
             if ((region != null) && (region.RegionID == regionInfos.RegionID) && 
                 ((region.posX != regionInfos.RegionLocX) || (region.posY != regionInfos.RegionLocY)))
             {
                 if ((Convert.ToInt32(region.Data["flags"]) & (int)OpenSim.Data.RegionFlags.NoMove) != 0)
-                    return false;
+                    return "Can't move this region";
 
                 // Region reregistering in other coordinates. Delete the old entry
                 m_log.DebugFormat("[GRID SERVICE]: Region {0} ({1}) was previously registered at {2}-{3}. Deleting old entry.",
@@ -167,6 +167,23 @@ namespace OpenSim.Services.GridService
                 }
             }
 
+            if (!m_AllowDuplicateNames)
+            {
+                List<RegionData> dupe = m_Database.Get(regionInfos.RegionName, scopeID);
+                if (dupe != null && dupe.Count > 0)
+                {
+                    foreach (RegionData d in dupe)
+                    {
+                        if (d.RegionID != regionInfos.RegionID)
+                        {
+                            m_log.WarnFormat("[GRID SERVICE]: Region {0} tried to register duplicate name with ID {1}.", 
+                                regionInfos.RegionName, regionInfos.RegionID);
+                            return "Duplicate region name";
+                        }
+                    }
+                }
+            }
+
             // Everything is ok, let's register
             RegionData rdata = RegionInfo2RegionData(regionInfos);
             rdata.ScopeID = scopeID;
@@ -175,7 +192,7 @@ namespace OpenSim.Services.GridService
             {
                 int oldFlags = Convert.ToInt32(region.Data["flags"]);
                 if ((oldFlags & (int)OpenSim.Data.RegionFlags.LockedOut) != 0)
-                    return false;
+                    return "Region locked out";
 
                 oldFlags &= ~(int)OpenSim.Data.RegionFlags.Reservation;
 
@@ -211,7 +228,7 @@ namespace OpenSim.Services.GridService
             m_log.DebugFormat("[GRID SERVICE]: Region {0} ({1}) registered successfully at {2}-{3}", 
                 regionInfos.RegionName, regionInfos.RegionID, regionInfos.RegionLocX, regionInfos.RegionLocY);
 
-            return true;
+            return String.Empty;
         }
 
         public bool DeregisterRegion(UUID regionID)
diff --git a/OpenSim/Services/Interfaces/IGridService.cs b/OpenSim/Services/Interfaces/IGridService.cs
index 6b6b347..6186d80 100644
--- a/OpenSim/Services/Interfaces/IGridService.cs
+++ b/OpenSim/Services/Interfaces/IGridService.cs
@@ -42,7 +42,7 @@ namespace OpenSim.Services.Interfaces
         /// <param name="regionInfos"> </param>
         /// <returns></returns>
         /// <exception cref="System.Exception">Thrown if region registration failed</exception>
-        bool RegisterRegion(UUID scopeID, GridRegion regionInfos);
+        string RegisterRegion(UUID scopeID, GridRegion regionInfos);
 
         /// <summary>
         /// Deregister a region with the grid service.