aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Region/Framework/Scenes/Scene.cs
diff options
context:
space:
mode:
authorDiva Canto2010-03-05 21:37:18 -0800
committerDiva Canto2010-03-05 21:37:18 -0800
commit6aed4323a33618e9daeeaaeff598b98755c67a3d (patch)
tree6468f6873c1f7dd87f58791a9404ead305a676e7 /OpenSim/Region/Framework/Scenes/Scene.cs
parentJustin, I must have been dyslexic when I wrote UserGridService as the name fo... (diff)
parentMerge branch 'master' of ssh://opensimulator.org/var/git/opensim (diff)
downloadopensim-SC_OLD-6aed4323a33618e9daeeaaeff598b98755c67a3d.zip
opensim-SC_OLD-6aed4323a33618e9daeeaaeff598b98755c67a3d.tar.gz
opensim-SC_OLD-6aed4323a33618e9daeeaaeff598b98755c67a3d.tar.bz2
opensim-SC_OLD-6aed4323a33618e9daeeaaeff598b98755c67a3d.tar.xz
Merge branch 'master' of ssh://diva@opensimulator.org/var/git/opensim
Diffstat (limited to '')
-rw-r--r--OpenSim/Region/Framework/Scenes/Scene.cs5
1 files changed, 1 insertions, 4 deletions
diff --git a/OpenSim/Region/Framework/Scenes/Scene.cs b/OpenSim/Region/Framework/Scenes/Scene.cs
index 7c0375e..30c69a8 100644
--- a/OpenSim/Region/Framework/Scenes/Scene.cs
+++ b/OpenSim/Region/Framework/Scenes/Scene.cs
@@ -1133,10 +1133,7 @@ namespace OpenSim.Region.Framework.Scenes
1133 1133
1134 public int GetInaccurateNeighborCount() 1134 public int GetInaccurateNeighborCount()
1135 { 1135 {
1136 lock (m_neighbours) 1136 return m_neighbours.Count;
1137 {
1138 return m_neighbours.Count;
1139 }
1140 } 1137 }
1141 1138
1142 // This is the method that shuts down the scene. 1139 // This is the method that shuts down the scene.