Browse Source

Minor: may avoid crashes of sims that still don't have this configuration section.

Diva Canto 11 years ago
parent
commit
f931c0a868

+ 3 - 0
OpenSim/Framework/AssetPermissions.cs

@@ -35,6 +35,9 @@ namespace OpenSim.Framework
 
         private void LoadPermsFromConfig(IConfig assetConfig, string variable, bool[] bitArray)
         {
+            if (assetConfig == null)
+                return;
+
             string perms = assetConfig.GetString(variable, String.Empty);
             string[] parts = perms.Split(new char[] { ',' }, StringSplitOptions.RemoveEmptyEntries);
             foreach (string s in parts)

+ 1 - 1
OpenSim/Region/CoreModules/ServiceConnectorsOut/Asset/HGAssetBroker.cs

@@ -131,7 +131,7 @@ namespace OpenSim.Region.CoreModules.ServiceConnectorsOut.Asset
                         m_LocalAssetServiceURI = m_LocalAssetServiceURI.Trim('/');
 
                     IConfig hgConfig = source.Configs["HGAssetService"];
-                    m_AssetPerms = new AssetPermissions(hgConfig);
+                    m_AssetPerms = new AssetPermissions(hgConfig); // it's ok if arg is null
 
                     m_Enabled = true;
                     m_log.Info("[HG ASSET CONNECTOR]: HG asset broker enabled");