diff options
author | Melanie | 2010-10-09 01:07:41 +0100 |
---|---|---|
committer | Melanie | 2010-10-09 01:07:41 +0100 |
commit | 231feab57ff1e6d92388b75645382c865e65dea2 (patch) | |
tree | 014c2218919051fdbb995c844ebb322145e1c36b /OpenSim/Region/Framework/Scenes | |
parent | Fix a security relevant issue with take / take copy (diff) | |
parent | Merge branch 'master' of melanie@opensimulator.org:/var/git/opensim (diff) | |
download | opensim-SC-231feab57ff1e6d92388b75645382c865e65dea2.zip opensim-SC-231feab57ff1e6d92388b75645382c865e65dea2.tar.gz opensim-SC-231feab57ff1e6d92388b75645382c865e65dea2.tar.bz2 opensim-SC-231feab57ff1e6d92388b75645382c865e65dea2.tar.xz |
Merge branch 'master' into careminster-presence-refactor
Conflicts:
OpenSim/Region/CoreModules/Framework/InventoryAccess/InventoryAccessModule.cs
Diffstat (limited to 'OpenSim/Region/Framework/Scenes')
-rw-r--r-- | OpenSim/Region/Framework/Scenes/SceneViewer.cs | 8 |
1 files changed, 5 insertions, 3 deletions
diff --git a/OpenSim/Region/Framework/Scenes/SceneViewer.cs b/OpenSim/Region/Framework/Scenes/SceneViewer.cs index b45291f..b44a010 100644 --- a/OpenSim/Region/Framework/Scenes/SceneViewer.cs +++ b/OpenSim/Region/Framework/Scenes/SceneViewer.cs | |||
@@ -179,11 +179,13 @@ namespace OpenSim.Region.Framework.Scenes | |||
179 | 179 | ||
180 | public void Reset() | 180 | public void Reset() |
181 | { | 181 | { |
182 | if (m_pendingObjects != null) | 182 | if (m_pendingObjects == null) |
183 | return; | ||
184 | |||
185 | lock (m_pendingObjects) | ||
183 | { | 186 | { |
184 | lock (m_pendingObjects) | 187 | if (m_pendingObjects != null) |
185 | { | 188 | { |
186 | |||
187 | m_pendingObjects.Clear(); | 189 | m_pendingObjects.Clear(); |
188 | m_pendingObjects = null; | 190 | m_pendingObjects = null; |
189 | } | 191 | } |