diff options
| author | Melanie | 2011-02-07 23:07:36 +0000 |
|---|---|---|
| committer | Melanie | 2011-02-07 23:07:36 +0000 |
| commit | 076f2ac8dbfa3dae31961ceadc41f4c0319f1fb0 (patch) | |
| tree | d6d80e7364bd96b95dddfbf03b708e2ea6ba3f77 /OpenSim/Region/Framework/Scenes | |
| parent | Fix merge issues (diff) | |
| parent | Hunting down mantis #5365 (diff) | |
| download | opensim-SC_OLD-076f2ac8dbfa3dae31961ceadc41f4c0319f1fb0.zip opensim-SC_OLD-076f2ac8dbfa3dae31961ceadc41f4c0319f1fb0.tar.gz opensim-SC_OLD-076f2ac8dbfa3dae31961ceadc41f4c0319f1fb0.tar.bz2 opensim-SC_OLD-076f2ac8dbfa3dae31961ceadc41f4c0319f1fb0.tar.xz | |
Merge branch 'master' into careminster-presence-refactor
Diffstat (limited to 'OpenSim/Region/Framework/Scenes')
| -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 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; |