diff options
| author | John Hurliman | 2009-10-21 16:24:17 -0700 |
|---|---|---|
| committer | John Hurliman | 2009-10-21 16:24:17 -0700 |
| commit | 2b39ff0a39229f1cea513b12e6d093e31c40d0b2 (patch) | |
| tree | 9b5637ecf48129b025fafec5eeed19c852e13716 /OpenSim/Framework/RegionInfo.cs | |
| parent | * FireQueueEmpty now checks if a measurable amount of time has passed, and if... (diff) | |
| parent | Fix llParticleSystem to accept LSL variables and LSL constants in place (diff) | |
| download | opensim-SC-2b39ff0a39229f1cea513b12e6d093e31c40d0b2.zip opensim-SC-2b39ff0a39229f1cea513b12e6d093e31c40d0b2.tar.gz opensim-SC-2b39ff0a39229f1cea513b12e6d093e31c40d0b2.tar.bz2 opensim-SC-2b39ff0a39229f1cea513b12e6d093e31c40d0b2.tar.xz | |
Merged master into prioritization
Diffstat (limited to 'OpenSim/Framework/RegionInfo.cs')
| -rw-r--r-- | OpenSim/Framework/RegionInfo.cs | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/OpenSim/Framework/RegionInfo.cs b/OpenSim/Framework/RegionInfo.cs index fa747c4..721233d 100644 --- a/OpenSim/Framework/RegionInfo.cs +++ b/OpenSim/Framework/RegionInfo.cs | |||
| @@ -978,11 +978,12 @@ namespace OpenSim.Framework | |||
| 978 | 978 | ||
| 979 | public void SaveLastMapUUID(UUID mapUUID) | 979 | public void SaveLastMapUUID(UUID mapUUID) |
| 980 | { | 980 | { |
| 981 | if (null == configMember) return; | ||
| 982 | |||
| 983 | lastMapUUID = mapUUID; | 981 | lastMapUUID = mapUUID; |
| 984 | lastMapRefresh = Util.UnixTimeSinceEpoch().ToString(); | 982 | lastMapRefresh = Util.UnixTimeSinceEpoch().ToString(); |
| 985 | 983 | ||
| 984 | if (configMember == null) | ||
| 985 | return; | ||
| 986 | |||
| 986 | configMember.forceSetConfigurationOption("lastmap_uuid", mapUUID.ToString()); | 987 | configMember.forceSetConfigurationOption("lastmap_uuid", mapUUID.ToString()); |
| 987 | configMember.forceSetConfigurationOption("lastmap_refresh", lastMapRefresh); | 988 | configMember.forceSetConfigurationOption("lastmap_refresh", lastMapRefresh); |
| 988 | } | 989 | } |