aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Region/Framework/Scenes/SceneViewer.cs
diff options
context:
space:
mode:
authorMelanie2011-02-07 22:26:09 +0100
committerMelanie2011-02-07 22:26:09 +0100
commit8c20f94939347d504c175ca7afb6b456188cdf2c (patch)
treec11023fbc6e701b44128d2b54bd024abd912a1b3 /OpenSim/Region/Framework/Scenes/SceneViewer.cs
parentPrevent a nonexistent inventory item from throwing an exception (diff)
parentMerge branch 'master' into careminster-presence-refactor (diff)
downloadopensim-SC_OLD-8c20f94939347d504c175ca7afb6b456188cdf2c.zip
opensim-SC_OLD-8c20f94939347d504c175ca7afb6b456188cdf2c.tar.gz
opensim-SC_OLD-8c20f94939347d504c175ca7afb6b456188cdf2c.tar.bz2
opensim-SC_OLD-8c20f94939347d504c175ca7afb6b456188cdf2c.tar.xz
Merge branch 'careminster-presence-refactor' of ssh://3dhosting.de/var/git/careminster into careminster-presence-refactor
Diffstat (limited to 'OpenSim/Region/Framework/Scenes/SceneViewer.cs')
-rw-r--r--OpenSim/Region/Framework/Scenes/SceneViewer.cs8
1 files changed, 8 insertions, 0 deletions
diff --git a/OpenSim/Region/Framework/Scenes/SceneViewer.cs b/OpenSim/Region/Framework/Scenes/SceneViewer.cs
index 40a73a9..1f4ec96 100644
--- a/OpenSim/Region/Framework/Scenes/SceneViewer.cs
+++ b/OpenSim/Region/Framework/Scenes/SceneViewer.cs
@@ -205,6 +205,14 @@ namespace OpenSim.Region.Framework.Scenes
205 Reset(); 205 Reset();
206 } 206 }
207 207
208 public int GetPendingObjectsCount()
209 {
210 if (m_pendingObjects != null)
211 return m_pendingObjects.Count;
212
213 return 0;
214 }
215
208 public class ScenePartUpdate 216 public class ScenePartUpdate
209 { 217 {
210 public UUID FullID; 218 public UUID FullID;