diff options
| author | Melanie | 2011-11-04 01:18:37 +0000 |
|---|---|---|
| committer | Melanie | 2011-11-04 01:18:37 +0000 |
| commit | 24235006f473cec56213705ce70df781cf9bcbc1 (patch) | |
| tree | 7d0e75978d48272827c3f03f087bf79658dd16cf /OpenSim/Region/Framework/Scenes/SceneGraph.cs | |
| parent | Merge branch 'master' into bigmerge (diff) | |
| parent | Rename ForEachAvatar back to ForEachScenePresence. The other changes (diff) | |
| download | opensim-SC-24235006f473cec56213705ce70df781cf9bcbc1.zip opensim-SC-24235006f473cec56213705ce70df781cf9bcbc1.tar.gz opensim-SC-24235006f473cec56213705ce70df781cf9bcbc1.tar.bz2 opensim-SC-24235006f473cec56213705ce70df781cf9bcbc1.tar.xz | |
Merge branch 'master' into bigmerge
Conflicts:
OpenSim/Region/CoreModules/Avatar/Chat/ChatModule.cs
OpenSim/Region/CoreModules/Avatar/Gods/GodsModule.cs
OpenSim/Region/CoreModules/LightShare/LightShareModule.cs
OpenSim/Region/CoreModules/World/Estate/EstateManagementModule.cs
Diffstat (limited to 'OpenSim/Region/Framework/Scenes/SceneGraph.cs')
| -rw-r--r-- | OpenSim/Region/Framework/Scenes/SceneGraph.cs | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/OpenSim/Region/Framework/Scenes/SceneGraph.cs b/OpenSim/Region/Framework/Scenes/SceneGraph.cs index e1fde64..d780fb3 100644 --- a/OpenSim/Region/Framework/Scenes/SceneGraph.cs +++ b/OpenSim/Region/Framework/Scenes/SceneGraph.cs | |||
| @@ -1265,7 +1265,7 @@ namespace OpenSim.Region.Framework.Scenes | |||
| 1265 | /// This is just a shortcut function since frequently actions only appy to root SPs | 1265 | /// This is just a shortcut function since frequently actions only appy to root SPs |
| 1266 | /// </summary> | 1266 | /// </summary> |
| 1267 | /// <param name="action"></param> | 1267 | /// <param name="action"></param> |
| 1268 | public void ForEachRootScenePresence(Action<ScenePresence> action) | 1268 | public void ForEachAvatar(Action<ScenePresence> action) |
| 1269 | { | 1269 | { |
| 1270 | ForEachScenePresence(delegate(ScenePresence sp) | 1270 | ForEachScenePresence(delegate(ScenePresence sp) |
| 1271 | { | 1271 | { |