Merge branch 'master' of ssh://opensimulator.org/var/git/opensim

author: Justin Clark-Casey (justincc) 2010-09-08 01:05:56 +0100
committer: Justin Clark-Casey (justincc) 2010-09-08 01:05:56 +0100
commit: b8d14fcc4a7d819af5015144518ce31cd86d0383 (patch)
tree: 67119cd2cb9bf00e7bbc9ef0e9c4f139f4dbc643
parent: If a scene object part UUID is changed (only possible when not in a scene), t... (diff)
parent: Rolling back the recent libomv update but keeping the ExpiringCache cleanups ... (diff)
download: opensim-SC_OLD-b8d14fcc4a7d819af5015144518ce31cd86d0383.zip
opensim-SC_OLD-b8d14fcc4a7d819af5015144518ce31cd86d0383.tar.gz
opensim-SC_OLD-b8d14fcc4a7d819af5015144518ce31cd86d0383.tar.bz2
opensim-SC_OLD-b8d14fcc4a7d819af5015144518ce31cd86d0383.tar.xz
16 files changed, 224 insertions, 153 deletions
diff --git a/OpenSim/Framework/SLUtil.cs b/OpenSim/Framework/SLUtil.cs
index a489806..9941a7f 100644
--- a/OpenSim/Framework/SLUtil.cs
+++ b/OpenSim/Framework/SLUtil.cs
@@ -46,7 +46,7 @@ namespace OpenSim.Framework
                case AssetType.Texture:
                    return "image/x-j2c";
                case AssetType.Sound:
-                    return "application/ogg";
+                    return "audio/ogg";
                case AssetType.CallingCard:
                    return "application/vnd.ll.callingcard";
                case AssetType.Landmark:
@@ -98,8 +98,6 @@ namespace OpenSim.Framework
                    return "application/vnd.ll.outfitfolder";
                case AssetType.MyOutfitsFolder:
                    return "application/vnd.ll.myoutfitsfolder";
-                case AssetType.InboxFolder:
-                    return "application/vnd.ll.inboxfolder";
                case AssetType.Unknown:
                default:
                    return "application/octet-stream";
@@ -128,7 +126,7 @@ namespace OpenSim.Framework
                case InventoryType.Object:
                    return "application/vnd.ll.primitive";
                case InventoryType.Sound:
-                    return "application/ogg";
+                    return "audio/ogg";
                case InventoryType.Snapshot:
                case InventoryType.Texture:
                    return "image/x-j2c";
@@ -147,6 +145,7 @@ namespace OpenSim.Framework
                case "image/jp2":
                    return (sbyte)AssetType.Texture;
                case "application/ogg":
+                case "audio/ogg":
                    return (sbyte)AssetType.Sound;
                case "application/vnd.ll.callingcard":
                case "application/x-metaverse-callingcard":
@@ -209,8 +208,6 @@ namespace OpenSim.Framework
                    return (sbyte)AssetType.OutfitFolder;
                case "application/vnd.ll.myoutfitsfolder":
                    return (sbyte)AssetType.MyOutfitsFolder;
-                case "application/vnd.ll.inboxfolder":
-                    return (sbyte)AssetType.InboxFolder;
                case "application/octet-stream":
                default:
                    return (sbyte)AssetType.Unknown;
@@ -227,6 +224,7 @@ namespace OpenSim.Framework
                case "image/jpeg":
                    return (sbyte)InventoryType.Texture;
                case "application/ogg":
+                case "audio/ogg":
                case "audio/x-wav":
                    return (sbyte)InventoryType.Sound;
                case "application/vnd.ll.callingcard":
diff --git a/OpenSim/Region/ClientStack/LindenUDP/LLClientView.cs b/OpenSim/Region/ClientStack/LindenUDP/LLClientView.cs
index 9cdc80b..cdf8cb1 100644
--- a/OpenSim/Region/ClientStack/LindenUDP/LLClientView.cs
+++ b/OpenSim/Region/ClientStack/LindenUDP/LLClientView.cs
@@ -3529,9 +3529,9 @@ namespace OpenSim.Region.ClientStack.LindenUDP
        private void ProcessEntityUpdates(int maxUpdates)
        {
-            Lazy<List<ObjectUpdatePacket.ObjectDataBlock>> objectUpdateBlocks = new Lazy<List<ObjectUpdatePacket.ObjectDataBlock>>();
+            OpenSim.Framework.Lazy<List<ObjectUpdatePacket.ObjectDataBlock>> objectUpdateBlocks = new OpenSim.Framework.Lazy<List<ObjectUpdatePacket.ObjectDataBlock>>();
-            Lazy<List<ObjectUpdateCompressedPacket.ObjectDataBlock>> compressedUpdateBlocks = new Lazy<List<ObjectUpdateCompressedPacket.ObjectDataBlock>>();
+            OpenSim.Framework.Lazy<List<ObjectUpdateCompressedPacket.ObjectDataBlock>> compressedUpdateBlocks = new OpenSim.Framework.Lazy<List<ObjectUpdateCompressedPacket.ObjectDataBlock>>();
-            Lazy<List<ImprovedTerseObjectUpdatePacket.ObjectDataBlock>> terseUpdateBlocks = new Lazy<List<ImprovedTerseObjectUpdatePacket.ObjectDataBlock>>();
+            OpenSim.Framework.Lazy<List<ImprovedTerseObjectUpdatePacket.ObjectDataBlock>> terseUpdateBlocks = new OpenSim.Framework.Lazy<List<ImprovedTerseObjectUpdatePacket.ObjectDataBlock>>();
            if (maxUpdates <= 0) maxUpdates = Int32.MaxValue;
            int updatesThisCall = 0;
diff --git a/OpenSim/Region/CoreModules/ServiceConnectorsOut/UserAccounts/UserAccountCache.cs b/OpenSim/Region/CoreModules/ServiceConnectorsOut/UserAccounts/UserAccountCache.cs
index e1bc243..7c12b8c 100644
--- a/OpenSim/Region/CoreModules/ServiceConnectorsOut/UserAccounts/UserAccountCache.cs
+++ b/OpenSim/Region/CoreModules/ServiceConnectorsOut/UserAccounts/UserAccountCache.cs
@@ -36,6 +36,8 @@ namespace OpenSim.Region.CoreModules.ServiceConnectorsOut.UserAccounts
 {
    public class UserAccountCache
    {
+        private const double CACHE_EXPIRATION_SECONDS = 120.0;
        private static readonly ILog m_log =
                LogManager.GetLogger(
                MethodBase.GetCurrentMethod().DeclaringType);
@@ -51,9 +53,9 @@ namespace OpenSim.Region.CoreModules.ServiceConnectorsOut.UserAccounts
        public void Cache(UUID userID, UserAccount account)
        {
            // Cache even null accounts
-            m_UUIDCache.AddOrUpdate(userID, account, DateTime.Now + TimeSpan.FromMinutes(2.0d));
+            m_UUIDCache.AddOrUpdate(userID, account, DateTime.Now + TimeSpan.FromSeconds(CACHE_EXPIRATION_SECONDS));
            if (account != null)
-                m_NameCache.AddOrUpdate(account.Name, account.PrincipalID, DateTime.Now + TimeSpan.FromMinutes(2.0d));
+                m_NameCache.AddOrUpdate(account.Name, account.PrincipalID, DateTime.Now + TimeSpan.FromSeconds(CACHE_EXPIRATION_SECONDS));
            m_log.DebugFormat("[USER CACHE]: cached user {0}", userID);
        }
diff --git a/OpenSim/Region/CoreModules/World/Archiver/Tests/ArchiverTests.cs b/OpenSim/Region/CoreModules/World/Archiver/Tests/ArchiverTests.cs
index 32b3724..3342164 100644
--- a/OpenSim/Region/CoreModules/World/Archiver/Tests/ArchiverTests.cs
+++ b/OpenSim/Region/CoreModules/World/Archiver/Tests/ArchiverTests.cs
@@ -48,6 +48,7 @@ using OpenSim.Tests.Common.Setup;
 using ArchiveConstants = OpenSim.Framework.Serialization.ArchiveConstants;
 using TarArchiveReader = OpenSim.Framework.Serialization.TarArchiveReader;
 using TarArchiveWriter = OpenSim.Framework.Serialization.TarArchiveWriter;
+using RegionSettings = OpenSim.Framework.RegionSettings;
 namespace OpenSim.Region.CoreModules.World.Archiver.Tests
 {
@@ -135,7 +136,9 @@ namespace OpenSim.Region.CoreModules.World.Archiver.Tests
            SceneObjectPart part2 = CreateSceneObjectPart2();
            
-            AssetNotecard nc = new AssetNotecard("Hello World!");
+            AssetNotecard nc = new AssetNotecard();
+            nc.BodyText = "Hello World!";
+            nc.Encode();
            UUID ncAssetUuid = new UUID("00000000-0000-0000-1000-000000000000");
            UUID ncItemUuid = new UUID("00000000-0000-0000-1100-000000000000");
            AssetBase ncAsset 
diff --git a/OpenSim/Region/Framework/Scenes/SceneGraph.cs b/OpenSim/Region/Framework/Scenes/SceneGraph.cs
index e7175c5..dfb26b9 100644
--- a/OpenSim/Region/Framework/Scenes/SceneGraph.cs
+++ b/OpenSim/Region/Framework/Scenes/SceneGraph.cs
@@ -1632,6 +1632,11 @@ namespace OpenSim.Region.Framework.Scenes
                    // Unlink all child parts from their groups
                    //
                    child.ParentGroup.DelinkFromGroup(child, true);
+                    // These are not in affected groups and will not be
+                    // handled further. Do the honors here.
+                    child.ParentGroup.HasGroupChanged = true;
+                    child.ParentGroup.ScheduleGroupForFullUpdate();
                }
                foreach (SceneObjectPart root in rootParts)
diff --git a/OpenSim/Region/Framework/Scenes/Tests/SceneObjectLinkingTests.cs b/OpenSim/Region/Framework/Scenes/Tests/SceneObjectLinkingTests.cs
index 3c03ba0..e3ef263 100644
--- a/OpenSim/Region/Framework/Scenes/Tests/SceneObjectLinkingTests.cs
+++ b/OpenSim/Region/Framework/Scenes/Tests/SceneObjectLinkingTests.cs
@@ -307,7 +307,7 @@ namespace OpenSim.Region.Framework.Scenes.Tests
        public void TestDelinkPersistence()
        {
            TestHelper.InMethod();
-//            log4net.Config.XmlConfigurator.Configure();
+            //log4net.Config.XmlConfigurator.Configure();
            
            TestScene scene = SceneSetupHelpers.SetupScene();            
            
@@ -342,4 +342,4 @@ namespace OpenSim.Region.Framework.Scenes.Tests
            Assert.That(storedObjects[0].Children.ContainsKey(rootPartUuid));
        }
    }
-}
-\ No newline at end of file
+}
diff --git a/OpenSim/Region/Framework/Scenes/Tests/TaskInventoryTests.cs b/OpenSim/Region/Framework/Scenes/Tests/TaskInventoryTests.cs
index da8199d..5e491c2 100644
--- a/OpenSim/Region/Framework/Scenes/Tests/TaskInventoryTests.cs
+++ b/OpenSim/Region/Framework/Scenes/Tests/TaskInventoryTests.cs
@@ -75,7 +75,9 @@ namespace OpenSim.Region.Framework.Tests
        
        protected TaskInventoryItem CreateSOItem1(Scene scene, SceneObjectPart part)
        {
-            AssetNotecard nc = new AssetNotecard("Hello World!");
+            AssetNotecard nc = new AssetNotecard();
+            nc.BodyText = "Hello World!";
+            nc.Encode();
            UUID ncAssetUuid = new UUID("00000000-0000-0000-1000-000000000000");
            UUID ncItemUuid = new UUID("00000000-0000-0000-1100-000000000000");            
            AssetBase ncAsset 
diff --git a/OpenSim/Services/Connectors/SimianGrid/SimianAssetServiceConnector.cs b/OpenSim/Services/Connectors/SimianGrid/SimianAssetServiceConnector.cs
index 99e6983..8f601e8 100644
--- a/OpenSim/Services/Connectors/SimianGrid/SimianAssetServiceConnector.cs
+++ b/OpenSim/Services/Connectors/SimianGrid/SimianAssetServiceConnector.cs
@@ -81,7 +81,7 @@ namespace OpenSim.Services.Connectors.SimianGrid
        public SimianAssetServiceConnector(IConfigSource source)
        {
-            Initialise(source);
+            CommonInit(source);
        }
        public void Initialise(IConfigSource source)
@@ -91,31 +91,40 @@ namespace OpenSim.Services.Connectors.SimianGrid
            {
                string name = moduleConfig.GetString("AssetServices", "");
                if (name == Name)
-                {
+                    CommonInit(source);
-                    IConfig gridConfig = source.Configs["AssetService"];
+            }
-                    if (gridConfig != null)
+        }
-                    {
-                        string serviceUrl = gridConfig.GetString("AssetServerURI");
-                        if (!String.IsNullOrEmpty(serviceUrl))
-                        {
-                            if (!serviceUrl.EndsWith("/") && !serviceUrl.EndsWith("="))
-                                serviceUrl = serviceUrl + '/';
-                            m_serverUrl = serviceUrl;
-                        }
-                    }
-                    if (String.IsNullOrEmpty(m_serverUrl))
+        private void CommonInit(IConfigSource source)
-                        m_log.Info("[SIMIAN ASSET CONNECTOR]: No AssetServerURI specified, disabling connector");
+        {
-                    else
+            IConfig gridConfig = source.Configs["AssetService"];
-                        m_Enabled = true;
+            if (gridConfig != null)
+            {
+                string serviceUrl = gridConfig.GetString("AssetServerURI");
+                if (!String.IsNullOrEmpty(serviceUrl))
+                {
+                    if (!serviceUrl.EndsWith("/") && !serviceUrl.EndsWith("="))
+                        serviceUrl = serviceUrl + '/';
+                    m_serverUrl = serviceUrl;
                }
            }
+            if (String.IsNullOrEmpty(m_serverUrl))
+                m_log.Info("[SIMIAN ASSET CONNECTOR]: No AssetServerURI specified, disabling connector");
+            else
+                m_Enabled = true;
        }
        #region IAssetService
        public AssetBase Get(string id)
        {
+            if (String.IsNullOrEmpty(m_serverUrl))
+            {
+                m_log.Error("[SIMIAN ASSET CONNECTOR]: No AssetServerURI configured");
+                throw new InvalidOperationException();
+            }
            // Cache fetch
            if (m_cache != null)
            {
@@ -142,6 +151,12 @@ namespace OpenSim.Services.Connectors.SimianGrid
        /// <returns></returns>
        public AssetMetadata GetMetadata(string id)
        {
+            if (String.IsNullOrEmpty(m_serverUrl))
+            {
+                m_log.Error("[SIMIAN ASSET CONNECTOR]: No AssetServerURI configured");
+                throw new InvalidOperationException();
+            }
            AssetMetadata metadata = null;
            // Cache fetch
@@ -213,6 +228,12 @@ namespace OpenSim.Services.Connectors.SimianGrid
        /// <returns>True if the id was parseable, false otherwise</returns>
        public bool Get(string id, Object sender, AssetRetrieved handler)
        {
+            if (String.IsNullOrEmpty(m_serverUrl))
+            {
+                m_log.Error("[SIMIAN ASSET CONNECTOR]: No AssetServerURI configured");
+                throw new InvalidOperationException();
+            }
            // Cache fetch
            if (m_cache != null)
            {
@@ -243,6 +264,12 @@ namespace OpenSim.Services.Connectors.SimianGrid
        /// <returns></returns>
        public string Store(AssetBase asset)
        {
+            if (String.IsNullOrEmpty(m_serverUrl))
+            {
+                m_log.Error("[SIMIAN ASSET CONNECTOR]: No AssetServerURI configured");
+                throw new InvalidOperationException();
+            }
            bool storedInCache = false;
            string errorMessage = null;
@@ -375,6 +402,12 @@ namespace OpenSim.Services.Connectors.SimianGrid
        /// <returns></returns>
        public bool Delete(string id)
        {
+            if (String.IsNullOrEmpty(m_serverUrl))
+            {
+                m_log.Error("[SIMIAN ASSET CONNECTOR]: No AssetServerURI configured");
+                throw new InvalidOperationException();
+            }
            //string errorMessage = String.Empty;
            string url = m_serverUrl + id;
diff --git a/OpenSim/Services/Connectors/SimianGrid/SimianAuthenticationServiceConnector.cs b/OpenSim/Services/Connectors/SimianGrid/SimianAuthenticationServiceConnector.cs
index 68f73ee..51a09f8 100644
--- a/OpenSim/Services/Connectors/SimianGrid/SimianAuthenticationServiceConnector.cs
+++ b/OpenSim/Services/Connectors/SimianGrid/SimianAuthenticationServiceConnector.cs
@@ -69,7 +69,7 @@ namespace OpenSim.Services.Connectors.SimianGrid
        public SimianAuthenticationServiceConnector(IConfigSource source)
        {
-            Initialise(source);
+            CommonInit(source);
        }
        public void Initialise(IConfigSource source)
@@ -79,24 +79,27 @@ namespace OpenSim.Services.Connectors.SimianGrid
            {
                string name = moduleConfig.GetString("AuthenticationServices", "");
                if (name == Name)
-                {
+                    CommonInit(source);
-                    IConfig gridConfig = source.Configs["AuthenticationService"];
+            }
-                    if (gridConfig != null)
+        }
-                    {
-                        string serviceUrl = gridConfig.GetString("AuthenticationServerURI");
-                        if (!String.IsNullOrEmpty(serviceUrl))
-                        {
-                            if (!serviceUrl.EndsWith("/") && !serviceUrl.EndsWith("="))
-                                serviceUrl = serviceUrl + '/';
-                            m_serverUrl = serviceUrl;
-                            m_Enabled = true;
-                        }
-                    }
-                    if (String.IsNullOrEmpty(m_serverUrl))
+        private void CommonInit(IConfigSource source)
-                        m_log.Info("[SIMIAN AUTH CONNECTOR]: No AuthenticationServerURI specified, disabling connector");
+        {
+            IConfig gridConfig = source.Configs["AuthenticationService"];
+            if (gridConfig != null)
+            {
+                string serviceUrl = gridConfig.GetString("AuthenticationServerURI");
+                if (!String.IsNullOrEmpty(serviceUrl))
+                {
+                    if (!serviceUrl.EndsWith("/") && !serviceUrl.EndsWith("="))
+                        serviceUrl = serviceUrl + '/';
+                    m_serverUrl = serviceUrl;
+                    m_Enabled = true;
                }
            }
+            if (String.IsNullOrEmpty(m_serverUrl))
+                m_log.Info("[SIMIAN AUTH CONNECTOR]: No AuthenticationServerURI specified, disabling connector");
        }
        public string Authenticate(UUID principalID, string password, int lifetime)
diff --git a/OpenSim/Services/Connectors/SimianGrid/SimianAvatarServiceConnector.cs b/OpenSim/Services/Connectors/SimianGrid/SimianAvatarServiceConnector.cs
index 7e56bd1..3505c64 100644
--- a/OpenSim/Services/Connectors/SimianGrid/SimianAvatarServiceConnector.cs
+++ b/OpenSim/Services/Connectors/SimianGrid/SimianAvatarServiceConnector.cs
@@ -74,7 +74,7 @@ namespace OpenSim.Services.Connectors.SimianGrid
        public SimianAvatarServiceConnector(IConfigSource source)
        {
-            Initialise(source);
+            CommonInit(source);
        }
        public void Initialise(IConfigSource source)
@@ -84,24 +84,27 @@ namespace OpenSim.Services.Connectors.SimianGrid
            {
                string name = moduleConfig.GetString("AvatarServices", "");
                if (name == Name)
-                {
+                    CommonInit(source);
-                    IConfig gridConfig = source.Configs["AvatarService"];
+            }
-                    if (gridConfig != null)
+        }
-                    {
-                        string serviceUrl = gridConfig.GetString("AvatarServerURI");
-                        if (!String.IsNullOrEmpty(serviceUrl))
-                        {
-                            if (!serviceUrl.EndsWith("/") && !serviceUrl.EndsWith("="))
-                                serviceUrl = serviceUrl + '/';
-                            m_serverUrl = serviceUrl;
-                            m_Enabled = true;
-                        }
-                    }
-                    if (String.IsNullOrEmpty(m_serverUrl))
+        private void CommonInit(IConfigSource source)
-                        m_log.Info("[SIMIAN AVATAR CONNECTOR]: No AvatarServerURI specified, disabling connector");
+        {
+            IConfig gridConfig = source.Configs["AvatarService"];
+            if (gridConfig != null)
+            {
+                string serviceUrl = gridConfig.GetString("AvatarServerURI");
+                if (!String.IsNullOrEmpty(serviceUrl))
+                {
+                    if (!serviceUrl.EndsWith("/") && !serviceUrl.EndsWith("="))
+                        serviceUrl = serviceUrl + '/';
+                    m_serverUrl = serviceUrl;
+                    m_Enabled = true;
                }
            }
+            if (String.IsNullOrEmpty(m_serverUrl))
+                m_log.Info("[SIMIAN AVATAR CONNECTOR]: No AvatarServerURI specified, disabling connector");
        }
        #region IAvatarService
diff --git a/OpenSim/Services/Connectors/SimianGrid/SimianGridServiceConnector.cs b/OpenSim/Services/Connectors/SimianGrid/SimianGridServiceConnector.cs
index a94620b..4409d5c 100644
--- a/OpenSim/Services/Connectors/SimianGrid/SimianGridServiceConnector.cs
+++ b/OpenSim/Services/Connectors/SimianGrid/SimianGridServiceConnector.cs
@@ -98,7 +98,7 @@ namespace OpenSim.Services.Connectors.SimianGrid
        public SimianGridServiceConnector(IConfigSource source)
        {
-            Initialise(source);
+            CommonInit(source);
        }
        public void Initialise(IConfigSource source)
@@ -108,24 +108,27 @@ namespace OpenSim.Services.Connectors.SimianGrid
            {
                string name = moduleConfig.GetString("GridServices", "");
                if (name == Name)
-                {
+                    CommonInit(source);
-                    IConfig gridConfig = source.Configs["GridService"];
+            }
-                    if (gridConfig != null)
+        }
-                    {
-                        string serviceUrl = gridConfig.GetString("GridServerURI");
-                        if (!String.IsNullOrEmpty(serviceUrl))
-                        {
-                            if (!serviceUrl.EndsWith("/") && !serviceUrl.EndsWith("="))
-                                serviceUrl = serviceUrl + '/';
-                            m_serverUrl = serviceUrl;
-                            m_Enabled = true;
-                        }
-                    }
-                    if (String.IsNullOrEmpty(m_serverUrl))
+        private void CommonInit(IConfigSource source)
-                        m_log.Info("[SIMIAN GRID CONNECTOR]: No GridServerURI specified, disabling connector");
+        {
+            IConfig gridConfig = source.Configs["GridService"];
+            if (gridConfig != null)
+            {
+                string serviceUrl = gridConfig.GetString("GridServerURI");
+                if (!String.IsNullOrEmpty(serviceUrl))
+                {
+                    if (!serviceUrl.EndsWith("/") && !serviceUrl.EndsWith("="))
+                        serviceUrl = serviceUrl + '/';
+                    m_serverUrl = serviceUrl;
+                    m_Enabled = true;
                }
            }
+            if (String.IsNullOrEmpty(m_serverUrl))
+                m_log.Info("[SIMIAN GRID CONNECTOR]: No GridServerURI specified, disabling connector");
        }
        #region IGridService
diff --git a/OpenSim/Services/Connectors/SimianGrid/SimianInventoryServiceConnector.cs b/OpenSim/Services/Connectors/SimianGrid/SimianInventoryServiceConnector.cs
index eb118ae..470eccd 100644
--- a/OpenSim/Services/Connectors/SimianGrid/SimianInventoryServiceConnector.cs
+++ b/OpenSim/Services/Connectors/SimianGrid/SimianInventoryServiceConnector.cs
@@ -88,7 +88,7 @@ namespace OpenSim.Services.Connectors.SimianGrid
        public SimianInventoryServiceConnector(IConfigSource source)
        {
-            Initialise(source);
+            CommonInit(source);
        }
        public void Initialise(IConfigSource source)
@@ -98,36 +98,39 @@ namespace OpenSim.Services.Connectors.SimianGrid
            {
                string name = moduleConfig.GetString("InventoryServices", "");
                if (name == Name)
+                    CommonInit(source);
+            }
+        }
+        private void CommonInit(IConfigSource source)
+        {
+            IConfig gridConfig = source.Configs["InventoryService"];
+            if (gridConfig != null)
+            {
+                string serviceUrl = gridConfig.GetString("InventoryServerURI");
+                if (!String.IsNullOrEmpty(serviceUrl))
                {
-                    IConfig gridConfig = source.Configs["InventoryService"];
+                    if (!serviceUrl.EndsWith("/") && !serviceUrl.EndsWith("="))
+                        serviceUrl = serviceUrl + '/';
+                    m_serverUrl = serviceUrl;
+                    gridConfig = source.Configs["UserAccountService"];
                    if (gridConfig != null)
                    {
-                        string serviceUrl = gridConfig.GetString("InventoryServerURI");
+                        serviceUrl = gridConfig.GetString("UserAccountServerURI");
                        if (!String.IsNullOrEmpty(serviceUrl))
                        {
-                            if (!serviceUrl.EndsWith("/") && !serviceUrl.EndsWith("="))
+                            m_userServerUrl = serviceUrl;
-                                serviceUrl = serviceUrl + '/';
+                            m_Enabled = true;
-                            m_serverUrl = serviceUrl;
-                            gridConfig = source.Configs["UserAccountService"];
-                            if (gridConfig != null)
-                            {
-                                serviceUrl = gridConfig.GetString("UserAccountServerURI");
-                                if (!String.IsNullOrEmpty(serviceUrl))
-                                {
-                                    m_userServerUrl = serviceUrl;
-                                    m_Enabled = true;
-                                }
-                            }
                        }
                    }
-                    if (String.IsNullOrEmpty(m_serverUrl))
-                        m_log.Info("[SIMIAN INVENTORY CONNECTOR]: No InventoryServerURI specified, disabling connector");
-                    else if (String.IsNullOrEmpty(m_userServerUrl))
-                        m_log.Info("[SIMIAN INVENTORY CONNECTOR]: No UserAccountServerURI specified, disabling connector");
                }
            }
+            if (String.IsNullOrEmpty(m_serverUrl))
+                m_log.Info("[SIMIAN INVENTORY CONNECTOR]: No InventoryServerURI specified, disabling connector");
+            else if (String.IsNullOrEmpty(m_userServerUrl))
+                m_log.Info("[SIMIAN INVENTORY CONNECTOR]: No UserAccountServerURI specified, disabling connector");
        }
        /// <summary>
diff --git a/OpenSim/Services/Connectors/SimianGrid/SimianPresenceServiceConnector.cs b/OpenSim/Services/Connectors/SimianGrid/SimianPresenceServiceConnector.cs
index 074c80f..077be3c 100644
--- a/OpenSim/Services/Connectors/SimianGrid/SimianPresenceServiceConnector.cs
+++ b/OpenSim/Services/Connectors/SimianGrid/SimianPresenceServiceConnector.cs
@@ -99,7 +99,7 @@ namespace OpenSim.Services.Connectors.SimianGrid
        public SimianPresenceServiceConnector(IConfigSource source)
        {
-            Initialise(source);
+            CommonInit(source);
        }
        public void Initialise(IConfigSource source)
@@ -109,24 +109,27 @@ namespace OpenSim.Services.Connectors.SimianGrid
            {
                string name = moduleConfig.GetString("PresenceServices", "");
                if (name == Name)
+                    CommonInit(source);
+            }
+        }
+        private void CommonInit(IConfigSource source)
+        {
+            IConfig gridConfig = source.Configs["PresenceService"];
+            if (gridConfig != null)
+            {
+                string serviceUrl = gridConfig.GetString("PresenceServerURI");
+                if (!String.IsNullOrEmpty(serviceUrl))
                {
-                    IConfig gridConfig = source.Configs["PresenceService"];
+                    if (!serviceUrl.EndsWith("/") && !serviceUrl.EndsWith("="))
-                    if (gridConfig != null)
+                        serviceUrl = serviceUrl + '/';
-                    {
+                    m_serverUrl = serviceUrl;
-                        string serviceUrl = gridConfig.GetString("PresenceServerURI");
+                    m_Enabled = true;
-                        if (!String.IsNullOrEmpty(serviceUrl))
-                        {
-                            if (!serviceUrl.EndsWith("/") && !serviceUrl.EndsWith("="))
-                                serviceUrl = serviceUrl + '/';
-                            m_serverUrl = serviceUrl;
-                            m_Enabled = true;
-                        }
-                    }
-                    if (String.IsNullOrEmpty(m_serverUrl))
-                        m_log.Info("[SIMIAN PRESENCE CONNECTOR]: No PresenceServerURI specified, disabling connector");
                }
            }
+            if (String.IsNullOrEmpty(m_serverUrl))
+                m_log.Info("[SIMIAN PRESENCE CONNECTOR]: No PresenceServerURI specified, disabling connector");
        }
        #region IPresenceService
diff --git a/OpenSim/Services/Connectors/SimianGrid/SimianUserAccountServiceConnector.cs b/OpenSim/Services/Connectors/SimianGrid/SimianUserAccountServiceConnector.cs
index deb8695..1ac9882 100644
--- a/OpenSim/Services/Connectors/SimianGrid/SimianUserAccountServiceConnector.cs
+++ b/OpenSim/Services/Connectors/SimianGrid/SimianUserAccountServiceConnector.cs
@@ -49,13 +49,15 @@ namespace OpenSim.Services.Connectors.SimianGrid
    [Extension(Path = "/OpenSim/RegionModules", NodeName = "RegionModule")]
    public class SimianUserAccountServiceConnector : IUserAccountService, ISharedRegionModule
    {
+        private const double CACHE_EXPIRATION_SECONDS = 120.0;
        private static readonly ILog m_log =
                LogManager.GetLogger(
                MethodBase.GetCurrentMethod().DeclaringType);
        private string m_serverUrl = String.Empty;
-        private ExpiringCache<UUID, UserAccount> m_accountCache;
+        private ExpiringCache<UUID, UserAccount> m_accountCache = new ExpiringCache<UUID,UserAccount>();
-        private bool m_Enabled = false;
+        private bool m_Enabled;
        #region ISharedRegionModule
@@ -73,7 +75,7 @@ namespace OpenSim.Services.Connectors.SimianGrid
        public SimianUserAccountServiceConnector(IConfigSource source)
        {
-            Initialise(source);
+            CommonInit(source);
        }
        public void Initialise(IConfigSource source)
@@ -83,24 +85,27 @@ namespace OpenSim.Services.Connectors.SimianGrid
            {
                string name = moduleConfig.GetString("UserAccountServices", "");
                if (name == Name)
-                {
+                    CommonInit(source);
-                    IConfig gridConfig = source.Configs["UserAccountService"];
+            }
-                    if (gridConfig != null)
+        }
-                    {
-                        string serviceUrl = gridConfig.GetString("UserAccountServerURI");
-                        if (!String.IsNullOrEmpty(serviceUrl))
-                        {
-                            if (!serviceUrl.EndsWith("/") && !serviceUrl.EndsWith("="))
-                                serviceUrl = serviceUrl + '/';
-                            m_serverUrl = serviceUrl;
-                            m_Enabled = true;
-                        }
-                    }
-                    if (String.IsNullOrEmpty(m_serverUrl))
+        private void CommonInit(IConfigSource source)
-                        m_log.Info("[SIMIAN ACCOUNT CONNECTOR]: No UserAccountServerURI specified, disabling connector");
+        {
+            IConfig gridConfig = source.Configs["UserAccountService"];
+            if (gridConfig != null)
+            {
+                string serviceUrl = gridConfig.GetString("UserAccountServerURI");
+                if (!String.IsNullOrEmpty(serviceUrl))
+                {
+                    if (!serviceUrl.EndsWith("/") && !serviceUrl.EndsWith("="))
+                        serviceUrl = serviceUrl + '/';
+                    m_serverUrl = serviceUrl;
+                    m_Enabled = true;
                }
            }
+            if (String.IsNullOrEmpty(m_serverUrl))
+                m_log.Info("[SIMIAN ACCOUNT CONNECTOR]: No UserAccountServerURI specified, disabling connector");
        }
        public UserAccount GetUserAccount(UUID scopeID, string firstName, string lastName)
@@ -138,7 +143,15 @@ namespace OpenSim.Services.Connectors.SimianGrid
                { "UserID", userID.ToString() }
            };
-            return GetUser(requestArgs);
+            account = GetUser(requestArgs);
+            if (account == null)
+            {
+                // Store null responses too, to avoid repeated lookups for missing accounts
+                m_accountCache.AddOrUpdate(userID, null, DateTime.Now + TimeSpan.FromSeconds(CACHE_EXPIRATION_SECONDS));
+            }
+            return account;
        }
        public List<UserAccount> GetUserAccounts(UUID scopeID, string query)
@@ -213,7 +226,7 @@ namespace OpenSim.Services.Connectors.SimianGrid
                if (success)
                {
                    // Cache the user account info
-                    m_accountCache.AddOrUpdate(data.PrincipalID, data, DateTime.Now + TimeSpan.FromMinutes(2.0d));
+                    m_accountCache.AddOrUpdate(data.PrincipalID, data, DateTime.Now + TimeSpan.FromSeconds(CACHE_EXPIRATION_SECONDS));
                }
                else
                {
@@ -278,7 +291,7 @@ namespace OpenSim.Services.Connectors.SimianGrid
            GetFirstLastName(response["Name"].AsString(), out account.FirstName, out account.LastName);
            // Cache the user account info
-            m_accountCache.AddOrUpdate(account.PrincipalID, account, DateTime.Now + TimeSpan.FromMinutes(2.0d));
+            m_accountCache.AddOrUpdate(account.PrincipalID, account, DateTime.Now + TimeSpan.FromSeconds(CACHE_EXPIRATION_SECONDS));
            return account;
        }
diff --git a/bin/config-include/HyperSimianGrid.ini b/bin/config-include/HyperSimianGrid.ini
index 87ffe69..49ba2ca 100644
--- a/bin/config-include/HyperSimianGrid.ini
+++ b/bin/config-include/HyperSimianGrid.ini
@@ -21,13 +21,13 @@
    Include-Common = "config-include/GridCommon.ini"
 [Modules]
-    GridServices = "OpenSim.Services.Connectors.dll:SimianGridServiceConnector"
+    GridServices = "SimianGridServiceConnector"
-    PresenceServices = "OpenSim.Services.Connectors.dll:SimianPresenceServiceConnector"
+    PresenceServices = "SimianPresenceServiceConnector"
-    UserAccountServices = "OpenSim.Services.Connectors.dll:SimianUserAccountServiceConnector"
+    UserAccountServices = "SimianUserAccountServiceConnector"
-    AuthenticationServices = "OpenSim.Services.Connectors.dll:SimianAuthenticationServiceConnector"
+    AuthenticationServices = "SimianAuthenticationServiceConnector"
    AssetServices = "HGAssetBroker"
    InventoryServices = "HGInventoryBroker"
-    AvatarServices = "OpenSim.Services.Connectors.dll:SimianAvatarServiceConnector"
+    AvatarServices = "SimianAvatarServiceConnector"
    
    NeighbourServices = "RemoteNeighbourServicesConnector"
    SimulationServices = "RemoteSimulationConnectorModule"
@@ -74,4 +74,4 @@
    ServicesConnectorModule = SimianGroupsServicesConnector
 [Profiles]
-    Module  = SimianProfiles
+    Module = "SimianProfiles"
diff --git a/bin/config-include/SimianGrid.ini b/bin/config-include/SimianGrid.ini
index 65d4ea6..9b27cc7 100644
--- a/bin/config-include/SimianGrid.ini
+++ b/bin/config-include/SimianGrid.ini
@@ -21,13 +21,13 @@
    Include-Common = "config-include/GridCommon.ini"
 [Modules]
-    GridServices = "OpenSim.Services.Connectors.dll:SimianGridServiceConnector"
+    GridServices = "SimianGridServiceConnector"
-    PresenceServices = "OpenSim.Services.Connectors.dll:SimianPresenceServiceConnector"
+    PresenceServices = "SimianPresenceServiceConnector"
-    UserAccountServices = "OpenSim.Services.Connectors.dll:SimianUserAccountServiceConnector"
+    UserAccountServices = "SimianUserAccountServiceConnector"
-    AuthenticationServices = "OpenSim.Services.Connectors.dll:SimianAuthenticationServiceConnector"
+    AuthenticationServices = "SimianAuthenticationServiceConnector"
-    AssetServices = "OpenSim.Services.Connectors.dll:SimianAssetServiceConnector"
+    AssetServices = "SimianAssetServiceConnector"
-    InventoryServices = "OpenSim.Services.Connectors.dll:SimianInventoryServiceConnector"
+    InventoryServices = "SimianInventoryServiceConnector"
-    AvatarServices = "OpenSim.Services.Connectors.dll:SimianAvatarServiceConnector"
+    AvatarServices = "SimianAvatarServiceConnector"
    
    NeighbourServices = "RemoteNeighbourServicesConnector"
    SimulationServices = "RemoteSimulationConnectorModule"
@@ -67,4 +67,4 @@
    ServicesConnectorModule = SimianGroupsServicesConnector
 [Profiles]
-    Module  = SimianProfiles
+    Module = "SimianProfiles"
author	Justin Clark-Casey (justincc)	2010-09-08 01:05:56 +0100
committer	Justin Clark-Casey (justincc)	2010-09-08 01:05:56 +0100
commit	b8d14fcc4a7d819af5015144518ce31cd86d0383 (patch)
tree	67119cd2cb9bf00e7bbc9ef0e9c4f139f4dbc643
parent	If a scene object part UUID is changed (only possible when not in a scene), t... (diff)
parent	Rolling back the recent libomv update but keeping the ExpiringCache cleanups ... (diff)
download	opensim-SC_OLD-b8d14fcc4a7d819af5015144518ce31cd86d0383.zip opensim-SC_OLD-b8d14fcc4a7d819af5015144518ce31cd86d0383.tar.gz opensim-SC_OLD-b8d14fcc4a7d819af5015144518ce31cd86d0383.tar.bz2 opensim-SC_OLD-b8d14fcc4a7d819af5015144518ce31cd86d0383.tar.xz