diff options
| author | BlueWall | 2011-02-12 20:42:11 -0500 |
|---|---|---|
| committer | BlueWall | 2011-02-12 20:42:11 -0500 |
| commit | c0e1742d479d4390701688da685892555f28bfbc (patch) | |
| tree | 39d717dd9ce4c453898eca2237f9fc2d2879c1d4 /OpenSim/Region/Framework/Scenes/SceneViewer.cs | |
| parent | Merge branch 'master' of /home/opensim/src/OpenSim/Core (diff) | |
| parent | Fixed a couple of tests in the HttpServer. Not sure if this is enough. Mantis... (diff) | |
| download | opensim-SC-c0e1742d479d4390701688da685892555f28bfbc.zip opensim-SC-c0e1742d479d4390701688da685892555f28bfbc.tar.gz opensim-SC-c0e1742d479d4390701688da685892555f28bfbc.tar.bz2 opensim-SC-c0e1742d479d4390701688da685892555f28bfbc.tar.xz | |
Merge branch 'master' of /home/opensim/src/OpenSim/Core
Diffstat (limited to 'OpenSim/Region/Framework/Scenes/SceneViewer.cs')
| -rw-r--r-- | OpenSim/Region/Framework/Scenes/SceneViewer.cs | 8 |
1 files changed, 8 insertions, 0 deletions
diff --git a/OpenSim/Region/Framework/Scenes/SceneViewer.cs b/OpenSim/Region/Framework/Scenes/SceneViewer.cs index b44a010..7c067ca 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; |