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/Region/DataSnapshot/DataSnapshotManager.cs | |
| parent | Merge commit '68c8633ba18f0a11cfc0ed04d1d0c7c59e6cec76' (diff) | |
| parent | Merge branch 'master' into careminster (diff) | |
| download | opensim-SC_OLD-159fcbf150b7da0e229b29aa7b94793484543d12.zip opensim-SC_OLD-159fcbf150b7da0e229b29aa7b94793484543d12.tar.gz opensim-SC_OLD-159fcbf150b7da0e229b29aa7b94793484543d12.tar.bz2 opensim-SC_OLD-159fcbf150b7da0e229b29aa7b94793484543d12.tar.xz | |
Merge branch 'master' of ssh://3dhosting.de/var/git/careminster
Conflicts:
OpenSim/Region/Framework/Scenes/SceneObjectGroup.cs
Diffstat (limited to 'OpenSim/Region/DataSnapshot/DataSnapshotManager.cs')
| -rw-r--r-- | OpenSim/Region/DataSnapshot/DataSnapshotManager.cs | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/OpenSim/Region/DataSnapshot/DataSnapshotManager.cs b/OpenSim/Region/DataSnapshot/DataSnapshotManager.cs index dd48dd5..0c0a7aa 100644 --- a/OpenSim/Region/DataSnapshot/DataSnapshotManager.cs +++ b/OpenSim/Region/DataSnapshot/DataSnapshotManager.cs | |||
| @@ -307,7 +307,7 @@ namespace OpenSim.Region.DataSnapshot | |||
| 307 | XmlNode regiondata = requestedSnap.CreateNode(XmlNodeType.Element, "regiondata", ""); | 307 | XmlNode regiondata = requestedSnap.CreateNode(XmlNodeType.Element, "regiondata", ""); |
| 308 | try | 308 | try |
| 309 | { | 309 | { |
| 310 | if (regionName == null || regionName == "") | 310 | if (string.IsNullOrEmpty(regionName)) |
| 311 | { | 311 | { |
| 312 | XmlNode timerblock = requestedSnap.CreateNode(XmlNodeType.Element, "expire", ""); | 312 | XmlNode timerblock = requestedSnap.CreateNode(XmlNodeType.Element, "expire", ""); |
| 313 | timerblock.InnerText = m_period.ToString(); | 313 | timerblock.InnerText = m_period.ToString(); |