diff options
| author | Melanie | 2011-10-25 01:42:52 +0100 |
|---|---|---|
| committer | Melanie | 2011-10-25 01:42:52 +0100 |
| commit | a8cc81a37e3e97fec4b4ce397c53e3b50fc84c4e (patch) | |
| tree | 197217a9944bf63f7bfeacf52ee7482bfde52ca9 /OpenSim/Region/Framework/Scenes/Scene.cs | |
| parent | Merge commit '631d5e16ef8c5340b6283b1a9ed9cc95aea3e3a1' into bigmerge (diff) | |
| parent | remove some mono compiler warnings (diff) | |
| download | opensim-SC-a8cc81a37e3e97fec4b4ce397c53e3b50fc84c4e.zip opensim-SC-a8cc81a37e3e97fec4b4ce397c53e3b50fc84c4e.tar.gz opensim-SC-a8cc81a37e3e97fec4b4ce397c53e3b50fc84c4e.tar.bz2 opensim-SC-a8cc81a37e3e97fec4b4ce397c53e3b50fc84c4e.tar.xz | |
Merge commit 'f08664f422f984fa57cc0ecb97c04eee3dccd183' into bigmerge
Conflicts:
OpenSim/Region/Framework/Scenes/Scene.cs
OpenSim/Region/Framework/Scenes/ScenePresence.cs
Diffstat (limited to 'OpenSim/Region/Framework/Scenes/Scene.cs')
| -rw-r--r-- | OpenSim/Region/Framework/Scenes/Scene.cs | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/OpenSim/Region/Framework/Scenes/Scene.cs b/OpenSim/Region/Framework/Scenes/Scene.cs index 98bc44f..63ac5f6 100644 --- a/OpenSim/Region/Framework/Scenes/Scene.cs +++ b/OpenSim/Region/Framework/Scenes/Scene.cs | |||
| @@ -212,7 +212,6 @@ namespace OpenSim.Region.Framework.Scenes | |||
| 212 | private bool m_firstHeartbeat = true; | 212 | private bool m_firstHeartbeat = true; |
| 213 | 213 | ||
| 214 | private object m_deleting_scene_object = new object(); | 214 | private object m_deleting_scene_object = new object(); |
| 215 | private object m_cleaningAttachments = new object(); | ||
| 216 | 215 | ||
| 217 | private bool m_cleaningTemps = false; | 216 | private bool m_cleaningTemps = false; |
| 218 | 217 | ||