diff options
| author | John Hurliman | 2010-09-12 14:21:51 -0700 |
|---|---|---|
| committer | John Hurliman | 2010-09-12 14:21:51 -0700 |
| commit | c03b24cbfdc449cf326cf0f560395753339169dc (patch) | |
| tree | d62a666839d3c638b5c9799c70be971a2d6d6c18 /OpenSim/Region/Framework/Scenes/SceneViewer.cs | |
| parent | * Added ISimulationDataService and IEstateDataService (diff) | |
| parent | Formatting cleanup. (diff) | |
| download | opensim-SC_OLD-c03b24cbfdc449cf326cf0f560395753339169dc.zip opensim-SC_OLD-c03b24cbfdc449cf326cf0f560395753339169dc.tar.gz opensim-SC_OLD-c03b24cbfdc449cf326cf0f560395753339169dc.tar.bz2 opensim-SC_OLD-c03b24cbfdc449cf326cf0f560395753339169dc.tar.xz | |
Merged
Diffstat (limited to 'OpenSim/Region/Framework/Scenes/SceneViewer.cs')
| -rw-r--r-- | OpenSim/Region/Framework/Scenes/SceneViewer.cs | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/OpenSim/Region/Framework/Scenes/SceneViewer.cs b/OpenSim/Region/Framework/Scenes/SceneViewer.cs index 7aa5a93..b45291f 100644 --- a/OpenSim/Region/Framework/Scenes/SceneViewer.cs +++ b/OpenSim/Region/Framework/Scenes/SceneViewer.cs | |||
| @@ -73,7 +73,7 @@ namespace OpenSim.Region.Framework.Scenes | |||
| 73 | { | 73 | { |
| 74 | m_pendingObjects = new Queue<SceneObjectGroup>(); | 74 | m_pendingObjects = new Queue<SceneObjectGroup>(); |
| 75 | 75 | ||
| 76 | lock(m_pendingObjects) | 76 | lock (m_pendingObjects) |
| 77 | { | 77 | { |
| 78 | EntityBase[] entities = m_presence.Scene.Entities.GetEntities(); | 78 | EntityBase[] entities = m_presence.Scene.Entities.GetEntities(); |
| 79 | foreach (EntityBase e in entities) | 79 | foreach (EntityBase e in entities) |
| @@ -85,7 +85,7 @@ namespace OpenSim.Region.Framework.Scenes | |||
| 85 | } | 85 | } |
| 86 | } | 86 | } |
| 87 | 87 | ||
| 88 | lock(m_pendingObjects) | 88 | lock (m_pendingObjects) |
| 89 | { | 89 | { |
| 90 | while (m_pendingObjects != null && m_pendingObjects.Count > 0) | 90 | while (m_pendingObjects != null && m_pendingObjects.Count > 0) |
| 91 | { | 91 | { |