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

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":

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;

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);
         }

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 

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)

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 

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,6 +91,11 @@ namespace OpenSim.Services.Connectors.SimianGrid
             {
                 string name = moduleConfig.GetString("AssetServices", "");
                 if (name == Name)
+                    CommonInit(source);
+            }
+        }
+
+        private void CommonInit(IConfigSource source)
         {
             IConfig gridConfig = source.Configs["AssetService"];
             if (gridConfig != null)
@@ -109,13 +114,17 @@ namespace OpenSim.Services.Connectors.SimianGrid
             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;
 

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,6 +79,11 @@ namespace OpenSim.Services.Connectors.SimianGrid
             {
                 string name = moduleConfig.GetString("AuthenticationServices", "");
                 if (name == Name)
+                    CommonInit(source);
+            }
+        }
+
+        private void CommonInit(IConfigSource source)
         {
             IConfig gridConfig = source.Configs["AuthenticationService"];
             if (gridConfig != null)
@@ -96,8 +101,6 @@ namespace OpenSim.Services.Connectors.SimianGrid
             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)
         {

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,6 +84,11 @@ namespace OpenSim.Services.Connectors.SimianGrid
             {
                 string name = moduleConfig.GetString("AvatarServices", "");
                 if (name == Name)
+                    CommonInit(source);
+            }
+        }
+
+        private void CommonInit(IConfigSource source)
         {
             IConfig gridConfig = source.Configs["AvatarService"];
             if (gridConfig != null)
@@ -101,8 +106,6 @@ namespace OpenSim.Services.Connectors.SimianGrid
             if (String.IsNullOrEmpty(m_serverUrl))
                 m_log.Info("[SIMIAN AVATAR CONNECTOR]: No AvatarServerURI specified, disabling connector");
         }
-            }
-        }
 
         #region IAvatarService
 

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,6 +108,11 @@ namespace OpenSim.Services.Connectors.SimianGrid
             {
                 string name = moduleConfig.GetString("GridServices", "");
                 if (name == Name)
+                    CommonInit(source);
+            }
+        }
+
+        private void CommonInit(IConfigSource source)
         {
             IConfig gridConfig = source.Configs["GridService"];
             if (gridConfig != null)
@@ -125,8 +130,6 @@ namespace OpenSim.Services.Connectors.SimianGrid
             if (String.IsNullOrEmpty(m_serverUrl))
                 m_log.Info("[SIMIAN GRID CONNECTOR]: No GridServerURI specified, disabling connector");
         }
-            }
-        }
 
         #region IGridService
 

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,6 +98,11 @@ 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)
@@ -127,8 +132,6 @@ namespace OpenSim.Services.Connectors.SimianGrid
             else if (String.IsNullOrEmpty(m_userServerUrl))
                 m_log.Info("[SIMIAN INVENTORY CONNECTOR]: No UserAccountServerURI specified, disabling connector");
         }
-            }
-        }
 
         /// <summary>
         /// Create the entire inventory for a given user

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,6 +109,11 @@ 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)
@@ -126,8 +131,6 @@ namespace OpenSim.Services.Connectors.SimianGrid
             if (String.IsNullOrEmpty(m_serverUrl))
                 m_log.Info("[SIMIAN PRESENCE CONNECTOR]: No PresenceServerURI specified, disabling connector");
         }
-            }
-        }
 
         #region IPresenceService
 

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,6 +85,11 @@ namespace OpenSim.Services.Connectors.SimianGrid
             {
                 string name = moduleConfig.GetString("UserAccountServices", "");
                 if (name == Name)
+                    CommonInit(source);
+            }
+        }
+
+        private void CommonInit(IConfigSource source)
         {
             IConfig gridConfig = source.Configs["UserAccountService"];
             if (gridConfig != null)
@@ -100,8 +107,6 @@ namespace OpenSim.Services.Connectors.SimianGrid
             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;
         }

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"

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"