aboutsummaryrefslogtreecommitdiffstatshomepage
diff options
context:
space:
mode:
authorDiva Canto2012-09-21 15:04:41 -0700
committerDiva Canto2012-09-21 15:04:41 -0700
commitf931c0a86893799548d1d0f72c327c37823e4612 (patch)
treee82a8afaf36dc10c245354bc51989ca5b04b9943
parentMerge branch 'master' of ssh://opensimulator.org/var/git/opensim (diff)
downloadopensim-SC_OLD-f931c0a86893799548d1d0f72c327c37823e4612.zip
opensim-SC_OLD-f931c0a86893799548d1d0f72c327c37823e4612.tar.gz
opensim-SC_OLD-f931c0a86893799548d1d0f72c327c37823e4612.tar.bz2
opensim-SC_OLD-f931c0a86893799548d1d0f72c327c37823e4612.tar.xz
Minor: may avoid crashes of sims that still don't have this configuration section.
-rw-r--r--OpenSim/Framework/AssetPermissions.cs3
-rw-r--r--OpenSim/Region/CoreModules/ServiceConnectorsOut/Asset/HGAssetBroker.cs2
2 files changed, 4 insertions, 1 deletions
diff --git a/OpenSim/Framework/AssetPermissions.cs b/OpenSim/Framework/AssetPermissions.cs
index d276def..4a905c2 100644
--- a/OpenSim/Framework/AssetPermissions.cs
+++ b/OpenSim/Framework/AssetPermissions.cs
@@ -35,6 +35,9 @@ namespace OpenSim.Framework
35 35
36 private void LoadPermsFromConfig(IConfig assetConfig, string variable, bool[] bitArray) 36 private void LoadPermsFromConfig(IConfig assetConfig, string variable, bool[] bitArray)
37 { 37 {
38 if (assetConfig == null)
39 return;
40
38 string perms = assetConfig.GetString(variable, String.Empty); 41 string perms = assetConfig.GetString(variable, String.Empty);
39 string[] parts = perms.Split(new char[] { ',' }, StringSplitOptions.RemoveEmptyEntries); 42 string[] parts = perms.Split(new char[] { ',' }, StringSplitOptions.RemoveEmptyEntries);
40 foreach (string s in parts) 43 foreach (string s in parts)
diff --git a/OpenSim/Region/CoreModules/ServiceConnectorsOut/Asset/HGAssetBroker.cs b/OpenSim/Region/CoreModules/ServiceConnectorsOut/Asset/HGAssetBroker.cs
index 0456852..1e1c7d0 100644
--- a/OpenSim/Region/CoreModules/ServiceConnectorsOut/Asset/HGAssetBroker.cs
+++ b/OpenSim/Region/CoreModules/ServiceConnectorsOut/Asset/HGAssetBroker.cs
@@ -131,7 +131,7 @@ namespace OpenSim.Region.CoreModules.ServiceConnectorsOut.Asset
131 m_LocalAssetServiceURI = m_LocalAssetServiceURI.Trim('/'); 131 m_LocalAssetServiceURI = m_LocalAssetServiceURI.Trim('/');
132 132
133 IConfig hgConfig = source.Configs["HGAssetService"]; 133 IConfig hgConfig = source.Configs["HGAssetService"];
134 m_AssetPerms = new AssetPermissions(hgConfig); 134 m_AssetPerms = new AssetPermissions(hgConfig); // it's ok if arg is null
135 135
136 m_Enabled = true; 136 m_Enabled = true;
137 m_log.Info("[HG ASSET CONNECTOR]: HG asset broker enabled"); 137 m_log.Info("[HG ASSET CONNECTOR]: HG asset broker enabled");