diff options
| author | Melanie Thielker | 2014-06-21 00:39:55 +0200 |
|---|---|---|
| committer | Melanie Thielker | 2014-06-21 00:39:55 +0200 |
| commit | 159fcbf150b7da0e229b29aa7b94793484543d12 (patch) | |
| tree | b8c0ff3b4c758a3fba8315b556c923ef4c02a185 /OpenSim/Framework/Configuration/XML/XmlConfiguration.cs | |
| parent | Merge commit '68c8633ba18f0a11cfc0ed04d1d0c7c59e6cec76' (diff) | |
| parent | Merge branch 'master' into careminster (diff) | |
| download | opensim-SC-159fcbf150b7da0e229b29aa7b94793484543d12.zip opensim-SC-159fcbf150b7da0e229b29aa7b94793484543d12.tar.gz opensim-SC-159fcbf150b7da0e229b29aa7b94793484543d12.tar.bz2 opensim-SC-159fcbf150b7da0e229b29aa7b94793484543d12.tar.xz | |
Merge branch 'master' of ssh://3dhosting.de/var/git/careminster
Conflicts:
OpenSim/Region/Framework/Scenes/SceneObjectGroup.cs
Diffstat (limited to 'OpenSim/Framework/Configuration/XML/XmlConfiguration.cs')
| -rw-r--r-- | OpenSim/Framework/Configuration/XML/XmlConfiguration.cs | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/OpenSim/Framework/Configuration/XML/XmlConfiguration.cs b/OpenSim/Framework/Configuration/XML/XmlConfiguration.cs index 43162fc..3152a7d 100644 --- a/OpenSim/Framework/Configuration/XML/XmlConfiguration.cs +++ b/OpenSim/Framework/Configuration/XML/XmlConfiguration.cs | |||
| @@ -121,7 +121,7 @@ namespace OpenSim.Framework.Configuration.XML | |||
| 121 | 121 | ||
| 122 | public void Commit() | 122 | public void Commit() |
| 123 | { | 123 | { |
| 124 | if (fileName == null || fileName == String.Empty) | 124 | if (string.IsNullOrEmpty(fileName)) |
| 125 | return; | 125 | return; |
| 126 | 126 | ||
| 127 | if (!Directory.Exists(Util.configDir())) | 127 | if (!Directory.Exists(Util.configDir())) |