diff options
author | Melanie | 2012-03-20 23:39:02 +0000 |
---|---|---|
committer | Melanie | 2012-03-20 23:39:02 +0000 |
commit | 35c3124c3badfc7c6e3b0ee1957cb827be678650 (patch) | |
tree | e245c0080da5acc0b9192208d0a421be865ba2cb /OpenSim/Region/Framework/Scenes/SceneBase.cs | |
parent | Merge branch 'master' into careminster (diff) | |
parent | Add prim name to "[MESH]: No recognized physics mesh..." log message (diff) | |
download | opensim-SC_OLD-35c3124c3badfc7c6e3b0ee1957cb827be678650.zip opensim-SC_OLD-35c3124c3badfc7c6e3b0ee1957cb827be678650.tar.gz opensim-SC_OLD-35c3124c3badfc7c6e3b0ee1957cb827be678650.tar.bz2 opensim-SC_OLD-35c3124c3badfc7c6e3b0ee1957cb827be678650.tar.xz |
Merge branch 'master' into careminster
Conflicts:
OpenSim/Region/Framework/Scenes/Scene.cs
Diffstat (limited to 'OpenSim/Region/Framework/Scenes/SceneBase.cs')
-rw-r--r-- | OpenSim/Region/Framework/Scenes/SceneBase.cs | 8 |
1 files changed, 6 insertions, 2 deletions
diff --git a/OpenSim/Region/Framework/Scenes/SceneBase.cs b/OpenSim/Region/Framework/Scenes/SceneBase.cs index 1e80f73..9b8a3ae 100644 --- a/OpenSim/Region/Framework/Scenes/SceneBase.cs +++ b/OpenSim/Region/Framework/Scenes/SceneBase.cs | |||
@@ -151,9 +151,13 @@ namespace OpenSim.Region.Framework.Scenes | |||
151 | #region Update Methods | 151 | #region Update Methods |
152 | 152 | ||
153 | /// <summary> | 153 | /// <summary> |
154 | /// Normally called once every frame/tick to let the world preform anything required (like running the physics simulation) | 154 | /// Called to update the scene loop by a number of frames and until shutdown. |
155 | /// </summary> | 155 | /// </summary> |
156 | public abstract void Update(); | 156 | /// <param name="frames"> |
157 | /// Number of frames to update. Exits on shutdown even if there are frames remaining. | ||
158 | /// If -1 then updates until shutdown. | ||
159 | /// </param> | ||
160 | public abstract void Update(int frames); | ||
157 | 161 | ||
158 | #endregion | 162 | #endregion |
159 | 163 | ||