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/Interfaces/ISceneViewer.cs | |
| 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/Interfaces/ISceneViewer.cs')
| -rw-r--r-- | OpenSim/Region/Framework/Interfaces/ISceneViewer.cs | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/OpenSim/Region/Framework/Interfaces/ISceneViewer.cs b/OpenSim/Region/Framework/Interfaces/ISceneViewer.cs index 7251d57..2397f22 100644 --- a/OpenSim/Region/Framework/Interfaces/ISceneViewer.cs +++ b/OpenSim/Region/Framework/Interfaces/ISceneViewer.cs | |||
| @@ -36,5 +36,6 @@ namespace OpenSim.Region.Framework.Interfaces | |||
| 36 | void Close(); | 36 | void Close(); |
| 37 | void QueuePartForUpdate(SceneObjectPart part); | 37 | void QueuePartForUpdate(SceneObjectPart part); |
| 38 | void SendPrimUpdates(); | 38 | void SendPrimUpdates(); |
| 39 | int GetPendingObjectsCount(); | ||
| 39 | } | 40 | } |
| 40 | } | 41 | } |