diff options
| author | Justin Clark-Casey (justincc) | 2012-09-22 00:26:32 +0100 |
|---|---|---|
| committer | Justin Clark-Casey (justincc) | 2012-09-22 00:26:32 +0100 |
| commit | 9ab5c5040d5d75d65ae3696e985ae3db77caeedf (patch) | |
| tree | 7470bee984c07ef11aba127d9d0794733cecd5f0 /OpenSim/Framework | |
| parent | Fix llListFindList() returning no match when there is a match with a script c... (diff) | |
| parent | Removed redundant asset fetches on HGAssetMapper. The UuidGatherer already do... (diff) | |
| download | opensim-SC_OLD-9ab5c5040d5d75d65ae3696e985ae3db77caeedf.zip opensim-SC_OLD-9ab5c5040d5d75d65ae3696e985ae3db77caeedf.tar.gz opensim-SC_OLD-9ab5c5040d5d75d65ae3696e985ae3db77caeedf.tar.bz2 opensim-SC_OLD-9ab5c5040d5d75d65ae3696e985ae3db77caeedf.tar.xz | |
Merge branch 'master' of ssh://opensimulator.org/var/git/opensim
Diffstat (limited to 'OpenSim/Framework')
| -rw-r--r-- | OpenSim/Framework/AssetPermissions.cs | 3 |
1 files changed, 3 insertions, 0 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) |