10 files changed, 115 insertions, 59 deletions

diff --git a/OpenSim/Services/AssetService/AssetService.cs b/OpenSim/Services/AssetService/AssetService.cs
index 5c37c33..ee2e568 100644
--- a/OpenSim/Services/AssetService/AssetService.cs
+++ b/OpenSim/Services/AssetService/AssetService.cs
@@ -82,7 +82,7 @@ namespace OpenSim.Services.AssetService
                                 if (existingAsset == null || Util.SHA1Hash(existingAsset.Data) != Util.SHA1Hash(a.Data))
                                 {
 //                                    m_log.DebugFormat("[ASSET]: Storing {0} {1}", a.Name, a.ID);
-                                    Store(a);
+                                    m_Database.StoreAsset(a);
                                 }
                             });
                     }
diff --git a/OpenSim/Services/AssetService/XAssetService.cs b/OpenSim/Services/AssetService/XAssetService.cs
index 9490d55..de7223b 100644
--- a/OpenSim/Services/AssetService/XAssetService.cs
+++ b/OpenSim/Services/AssetService/XAssetService.cs
@@ -80,7 +80,7 @@ namespace OpenSim.Services.AssetService
                                 if (existingAsset == null || Util.SHA1Hash(existingAsset.Data) != Util.SHA1Hash(a.Data))
                                 {
 //                                    m_log.DebugFormat("[ASSET]: Storing {0} {1}", a.Name, a.ID);
-                                    Store(a);
+                                    m_Database.StoreAsset(a);
                                 }
                             });
                     }
diff --git a/OpenSim/Services/Connectors/Asset/AssetServicesConnector.cs b/OpenSim/Services/Connectors/Asset/AssetServicesConnector.cs
index 7e81be7..205426e 100644
--- a/OpenSim/Services/Connectors/Asset/AssetServicesConnector.cs
+++ b/OpenSim/Services/Connectors/Asset/AssetServicesConnector.cs
@@ -29,6 +29,7 @@ using log4net;
 using System;
 using System.Threading;
 using System.Collections.Generic;
+using System.Collections.Concurrent;
 using System.IO;
 using System.Reflection;
 using System.Timers;
@@ -352,8 +353,7 @@ namespace OpenSim.Services.Connectors
             public string id;
         }
 
-        private OpenSim.Framework.BlockingQueue<QueuedAssetRequest> m_requestQueue =
-                new OpenSim.Framework.BlockingQueue<QueuedAssetRequest>();
+        private BlockingCollection<QueuedAssetRequest> m_requestQueue = new BlockingCollection<QueuedAssetRequest>();
 
         private void AssetRequestProcessor()
         {
@@ -361,10 +361,13 @@ namespace OpenSim.Services.Connectors
 
             while (true)
             {
-                r = m_requestQueue.Dequeue(4500);
-                Watchdog.UpdateThread();
-                if(r== null)
+                if(!m_requestQueue.TryTake(out r, 4500) || r == null)
+                {
+                    Watchdog.UpdateThread();
                     continue;
+                }
+
+                Watchdog.UpdateThread();
                 string uri = r.uri;
                 string id = r.id;
 
@@ -432,7 +435,7 @@ namespace OpenSim.Services.Connectors
                     QueuedAssetRequest request = new QueuedAssetRequest();
                     request.id = id;
                     request.uri = uri;
-                    m_requestQueue.Enqueue(request);
+                    m_requestQueue.Add(request);
                 }
             }
             else
diff --git a/OpenSim/Services/Connectors/Estate/EstateDataConnector.cs b/OpenSim/Services/Connectors/Estate/EstateDataConnector.cs
index b9a6281..0971b38 100644
--- a/OpenSim/Services/Connectors/Estate/EstateDataConnector.cs
+++ b/OpenSim/Services/Connectors/Estate/EstateDataConnector.cs
@@ -195,6 +195,14 @@ namespace OpenSim.Services.Connectors
             string uri = m_ServerURI + string.Format("/estates/estate/?region={0}&create={1}", regionID, create);
 
             reply = MakeRequest("GET", uri, string.Empty);
+            if(reply == null)
+            {
+                // this is a fatal error
+                m_log.DebugFormat("[ESTATE CONNECTOR] connection to remote estates service failed");
+                m_log.DebugFormat("[ESTATE CONNECTOR] simulator needs to terminate");
+                Environment.Exit(-1);
+            }
+
             if (String.IsNullOrEmpty(reply))
                 return null;
 
@@ -308,7 +316,8 @@ namespace OpenSim.Services.Connectors
             string reply = string.Empty;
             try
             {
-                reply = SynchronousRestFormsRequester.MakeRequest(verb, uri, formdata, m_Auth);
+                reply = SynchronousRestFormsRequester.MakeRequest(verb, uri, formdata, 30, m_Auth);
+                return reply;
             }
             catch (WebException e)
             {
@@ -317,14 +326,17 @@ namespace OpenSim.Services.Connectors
                     if (hwr != null)
                     {
                         if (hwr.StatusCode == HttpStatusCode.NotFound)
+                        {
                             m_log.Error(string.Format("[ESTATE CONNECTOR]: Resource {0} not found ", uri));
+                            return reply;
+                        }
                         if (hwr.StatusCode == HttpStatusCode.Unauthorized)
                             m_log.Error(string.Format("[ESTATE CONNECTOR]: Web request {0} requires authentication ", uri));
                     }
                     else
                         m_log.Error(string.Format(
                             "[ESTATE CONNECTOR]: WebException for {0} {1} {2} {3}",
-                            verb, uri, formdata, e));
+                            verb, uri, formdata, e.Message));
                 }
             }
             catch (Exception e)
@@ -332,7 +344,7 @@ namespace OpenSim.Services.Connectors
                 m_log.DebugFormat("[ESTATE CONNECTOR]: Exception when contacting estate server at {0}: {1}", uri, e.Message);
             }
 
-            return reply;
+            return null;
         }
     }
 }
diff --git a/OpenSim/Services/Connectors/MapImage/MapImageServicesConnector.cs b/OpenSim/Services/Connectors/MapImage/MapImageServicesConnector.cs
index 84c4efe..762d2f7 100644
--- a/OpenSim/Services/Connectors/MapImage/MapImageServicesConnector.cs
+++ b/OpenSim/Services/Connectors/MapImage/MapImageServicesConnector.cs
@@ -229,6 +229,7 @@ namespace OpenSim.Services.Connectors
                 string reply = SynchronousRestFormsRequester.MakeRequest("POST",
                         uri,
                         reqString,
+                        30,
                         m_Auth);
                 if (reply != string.Empty)
                 {
@@ -271,7 +272,7 @@ namespace OpenSim.Services.Connectors
             {
                 // This just dumps a warning for any operation that takes more than 100 ms
                 int tickdiff = Util.EnvironmentTickCountSubtract(tickstart);
-                m_log.DebugFormat("[MAP IMAGE CONNECTOR]: map tile uploaded in {0}ms", tickdiff);
+                m_log.DebugFormat("[MAP IMAGE CONNECTOR]: map tile upload time {0}ms", tickdiff);
             }
 
             return false;
diff --git a/OpenSim/Services/Connectors/Neighbour/NeighbourServicesConnector.cs b/OpenSim/Services/Connectors/Neighbour/NeighbourServicesConnector.cs
index 5f075ac..9f3b94c 100644
--- a/OpenSim/Services/Connectors/Neighbour/NeighbourServicesConnector.cs
+++ b/OpenSim/Services/Connectors/Neighbour/NeighbourServicesConnector.cs
@@ -151,7 +151,8 @@ namespace OpenSim.Services.Connectors
                 os.Write(buffer, 0, strBuffer.Length);         //Send it
                 //m_log.InfoFormat("[REST COMMS]: Posted HelloNeighbour request to remote sim {0}", uri);
             }
-            catch (Exception e)
+//            catch (Exception e)
+            catch
             {
 //                m_log.WarnFormat(
 //                    "[NEIGHBOUR SERVICE CONNCTOR]: Unable to send HelloNeighbour from {0} to {1}.  Exception {2}{3}",
diff --git a/OpenSim/Services/HypergridService/HGSuitcaseInventoryService.cs b/OpenSim/Services/HypergridService/HGSuitcaseInventoryService.cs
index d1f2e70..9b33217 100644
--- a/OpenSim/Services/HypergridService/HGSuitcaseInventoryService.cs
+++ b/OpenSim/Services/HypergridService/HGSuitcaseInventoryService.cs
@@ -399,7 +399,7 @@ namespace OpenSim.Services.HypergridService
             return false;
         }
 
-        public new InventoryItemBase GetItem(InventoryItemBase item)
+        public InventoryItemBase GetItem(InventoryItemBase item)
         {
             InventoryItemBase it = base.GetItem(item.Owner, item.ID);
             if (it == null)
diff --git a/OpenSim/Services/Interfaces/ILibraryService.cs b/OpenSim/Services/Interfaces/ILibraryService.cs
index 861cf0e..ea914da 100644
--- a/OpenSim/Services/Interfaces/ILibraryService.cs
+++ b/OpenSim/Services/Interfaces/ILibraryService.cs
@@ -38,6 +38,7 @@ namespace OpenSim.Services.Interfaces
         InventoryFolderImpl LibraryRootFolder { get; }
 
         Dictionary<UUID, InventoryFolderImpl> GetAllFolders();
+        InventoryItemBase GetItem(UUID itemID);
+        InventoryItemBase[] GetMultipleItems(UUID[] itemIDs);
     }
-
 }
diff --git a/OpenSim/Services/InventoryService/LibraryService.cs b/OpenSim/Services/InventoryService/LibraryService.cs
index c4a5572..de1c784 100644
--- a/OpenSim/Services/InventoryService/LibraryService.cs
+++ b/OpenSim/Services/InventoryService/LibraryService.cs
@@ -50,25 +50,40 @@ namespace OpenSim.Services.InventoryService
     {
         private static readonly ILog m_log = LogManager.GetLogger(MethodBase.GetCurrentMethod().DeclaringType);
 
-        private InventoryFolderImpl m_LibraryRootFolder;
+        static private InventoryFolderImpl m_LibraryRootFolder;
 
         public InventoryFolderImpl LibraryRootFolder
         {
             get { return m_LibraryRootFolder; }
         }
 
-        private UUID libOwner = new UUID("11111111-1111-0000-0000-000100bba000");
+        static private UUID libOwner = new UUID("11111111-1111-0000-0000-000100bba000");
 
         /// <summary>
         /// Holds the root library folder and all its descendents.  This is really only used during inventory
         /// setup so that we don't have to repeatedly search the tree of library folders.
         /// </summary>
-        protected Dictionary<UUID, InventoryFolderImpl> libraryFolders
-            = new Dictionary<UUID, InventoryFolderImpl>();
-
-        public LibraryService(IConfigSource config)
-            : base(config)
+        static protected Dictionary<UUID, InventoryFolderImpl> libraryFolders
+            = new Dictionary<UUID, InventoryFolderImpl>(32);
+
+        static protected Dictionary<UUID, InventoryItemBase> m_items = new Dictionary<UUID, InventoryItemBase>(256);
+        static LibraryService m_root;
+        static object m_rootLock = new object();
+        static readonly uint m_BasePermissions = (uint)PermissionMask.AllAndExport;
+        static readonly uint m_EveryOnePermissions = (uint)PermissionMask.AllAndExportNoMod;
+        static readonly uint m_CurrentPermissions = (uint)PermissionMask.AllAndExport;
+        static readonly uint m_NextPermissions = (uint)PermissionMask.AllAndExport;
+        static readonly uint m_GroupPermissions = 0;
+
+        public LibraryService(IConfigSource config):base(config)
         {
+            lock(m_rootLock)
+            {
+                if(m_root != null)
+                    return;
+                m_root = this;
+            }
+
             string pLibrariesLocation = Path.Combine("inventory", "Libraries.xml");
             string pLibName = "OpenSim Library";
 
@@ -86,8 +101,8 @@ namespace OpenSim.Services.InventoryService
             m_LibraryRootFolder.ID = new UUID("00000112-000f-0000-0000-000100bba000");
             m_LibraryRootFolder.Name = pLibName;
             m_LibraryRootFolder.ParentID = UUID.Zero;
-            m_LibraryRootFolder.Type = (short)8;
-            m_LibraryRootFolder.Version = (ushort)1;
+            m_LibraryRootFolder.Type = 8;
+            m_LibraryRootFolder.Version = 1;
 
             libraryFolders.Add(m_LibraryRootFolder.ID, m_LibraryRootFolder);
 
@@ -107,10 +122,11 @@ namespace OpenSim.Services.InventoryService
             item.AssetType = assetType;
             item.InvType = invType;
             item.Folder = parentFolderID;
-            item.BasePermissions = 0x7FFFFFFF;
-            item.EveryOnePermissions = 0x7FFFFFFF;
-            item.CurrentPermissions = 0x7FFFFFFF;
-            item.NextPermissions = 0x7FFFFFFF;
+            item.BasePermissions = m_BasePermissions;
+            item.EveryOnePermissions = m_EveryOnePermissions;
+            item.CurrentPermissions = m_CurrentPermissions;
+            item.NextPermissions = m_NextPermissions;
+            item.GroupPermissions = m_GroupPermissions;
             return item;
         }
 
@@ -132,6 +148,7 @@ namespace OpenSim.Services.InventoryService
         protected void ReadLibraryFromConfig(IConfig config, string path)
         {
             string basePath = Path.GetDirectoryName(path);
+            m_LibraryRootFolder.Version = (ushort)config.GetInt("RootVersion", 1);
             string foldersPath
                 = Path.Combine(
                     basePath, config.GetString("foldersFile", String.Empty));
@@ -157,9 +174,8 @@ namespace OpenSim.Services.InventoryService
             folderInfo.Name = config.GetString("name", "unknown");
             folderInfo.ParentID = new UUID(config.GetString("parentFolderID", m_LibraryRootFolder.ID.ToString()));
             folderInfo.Type = (short)config.GetInt("type", 8);
-
+            folderInfo.Version = (ushort)config.GetInt("version", 1);
             folderInfo.Owner = libOwner;
-            folderInfo.Version = 1;
 
             if (libraryFolders.ContainsKey(folderInfo.ParentID))
             {
@@ -187,28 +203,30 @@ namespace OpenSim.Services.InventoryService
             InventoryItemBase item = new InventoryItemBase();
             item.Owner = libOwner;
             item.CreatorId = libOwner.ToString();
-            item.ID = new UUID(config.GetString("inventoryID", m_LibraryRootFolder.ID.ToString()));
+            UUID itID = new UUID(config.GetString("inventoryID", m_LibraryRootFolder.ID.ToString()));
+            item.ID = itID; 
             item.AssetID = new UUID(config.GetString("assetID", item.ID.ToString()));
             item.Folder = new UUID(config.GetString("folderID", m_LibraryRootFolder.ID.ToString()));
             item.Name = config.GetString("name", String.Empty);
             item.Description = config.GetString("description", item.Name);
             item.InvType = config.GetInt("inventoryType", 0);
             item.AssetType = config.GetInt("assetType", item.InvType);
-            item.CurrentPermissions = (uint)config.GetLong("currentPermissions", (uint)PermissionMask.All);
-            item.NextPermissions = (uint)config.GetLong("nextPermissions", (uint)PermissionMask.All);
-            item.EveryOnePermissions
-                = (uint)config.GetLong("everyonePermissions", (uint)PermissionMask.All - (uint)PermissionMask.Modify);
-            item.BasePermissions = (uint)config.GetLong("basePermissions", (uint)PermissionMask.All);
+            item.CurrentPermissions = (uint)config.GetLong("currentPermissions", m_CurrentPermissions);
+            item.NextPermissions = (uint)config.GetLong("nextPermissions", m_NextPermissions);
+            item.EveryOnePermissions = (uint)config.GetLong("everyonePermissions", m_EveryOnePermissions);
+            item.BasePermissions = (uint)config.GetLong("basePermissions", m_BasePermissions);
+            item.GroupPermissions = (uint)config.GetLong("basePermissions", m_GroupPermissions);;
             item.Flags = (uint)config.GetInt("flags", 0);
 
             if (libraryFolders.ContainsKey(item.Folder))
             {
                 InventoryFolderImpl parentFolder = libraryFolders[item.Folder];
-                try
+                if(!parentFolder.Items.ContainsKey(itID))
                 {
-                    parentFolder.Items.Add(item.ID, item);
+                    parentFolder.Items.Add(itID, item);
+                    m_items[itID] = item;
                 }
-                catch (Exception)
+                else
                 {
                     m_log.WarnFormat("[LIBRARY INVENTORY] Item {1} [{0}] not added, duplicate item", item.ID, item.Name);
                 }
@@ -281,5 +299,26 @@ namespace OpenSim.Services.InventoryService
             folders.AddRange(subs);
             return folders;
         }
+
+        public InventoryItemBase GetItem(UUID itemID)
+        {
+            if(m_items.ContainsKey(itemID))
+                return m_items[itemID];
+            return null;
+        }
+
+        public InventoryItemBase[] GetMultipleItems(UUID[] ids)
+        {
+            List<InventoryItemBase> items = new List<InventoryItemBase>();
+            foreach (UUID id in ids)
+            {
+                if(m_items.ContainsKey(id))
+                    items.Add(m_items[id]);
+            }
+
+            if(items.Count == 0)
+                return null;
+            return items.ToArray();
+        }
     }
 }
diff --git a/OpenSim/Services/UserAccountService/UserAccountService.cs b/OpenSim/Services/UserAccountService/UserAccountService.cs
index 48929ee..5561287 100644
--- a/OpenSim/Services/UserAccountService/UserAccountService.cs
+++ b/OpenSim/Services/UserAccountService/UserAccountService.cs
@@ -86,30 +86,29 @@ namespace OpenSim.Services.UserAccountService
 
             m_CreateDefaultAvatarEntries = userConfig.GetBoolean("CreateDefaultAvatarEntries", false);
 
-                //  create a system grid god account
-            UserAccount ggod = GetUserAccount(UUID.Zero, UUID_GRID_GOD);
-            if(ggod == null)
-            {
-                UserAccountData d = new UserAccountData();
-
-                d.FirstName = "GRID";
-                d.LastName = "SERVICES";
-                d.PrincipalID = UUID_GRID_GOD;
-                d.ScopeID = UUID.Zero;
-                d.Data = new Dictionary<string, string>();
-                d.Data["Email"] = string.Empty;
-                d.Data["Created"] = Util.UnixTimeSinceEpoch().ToString();
-                d.Data["UserLevel"] = "240";
-                d.Data["UserFlags"] = "0";
-                d.Data["ServiceURLs"] = string.Empty;
-
-                m_Database.Store(d);
-            }
-
             if (m_RootInstance == null)
             {
                 m_RootInstance = this;
 
+                //  create a system grid god account
+                UserAccount ggod = GetUserAccount(UUID.Zero, UUID_GRID_GOD);
+                if(ggod == null)
+                {
+                    UserAccountData d = new UserAccountData();
+                    d.FirstName = "GRID";
+                    d.LastName = "SERVICES";
+                    d.PrincipalID = UUID_GRID_GOD;
+                    d.ScopeID = UUID.Zero;
+                    d.Data = new Dictionary<string, string>();
+                    d.Data["Email"] = string.Empty;
+                    d.Data["Created"] = Util.UnixTimeSinceEpoch().ToString();
+                    d.Data["UserLevel"] = "240";
+                    d.Data["UserFlags"] = "0";
+                    d.Data["ServiceURLs"] = string.Empty;
+
+                    m_Database.Store(d);
+                }
+
                 // In case there are several instances of this class in the same process,
                 // the console commands are only registered for the root instance
                 if (MainConsole.Instance != null)