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/ApplicationPlugins/Rest | |
| 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 '')
| -rw-r--r-- | OpenSim/ApplicationPlugins/Rest/Inventory/tests/Remote.cs | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/OpenSim/ApplicationPlugins/Rest/Inventory/tests/Remote.cs b/OpenSim/ApplicationPlugins/Rest/Inventory/tests/Remote.cs index b53806c..1c1afd0 100644 --- a/OpenSim/ApplicationPlugins/Rest/Inventory/tests/Remote.cs +++ b/OpenSim/ApplicationPlugins/Rest/Inventory/tests/Remote.cs | |||
| @@ -148,7 +148,7 @@ namespace OpenSim.ApplicationPlugins.Rest.Inventory.Tests | |||
| 148 | 148 | ||
| 149 | Rest.main.SceneManager.ForEachScene(delegate(Scene s) | 149 | Rest.main.SceneManager.ForEachScene(delegate(Scene s) |
| 150 | { | 150 | { |
| 151 | s.ForEachScenePresence(delegate(ScenePresence sp) | 151 | s.ForEachRootScenePresence(delegate(ScenePresence sp) |
| 152 | { | 152 | { |
| 153 | if (sp.Firstname == names[0] && sp.Lastname == names[1]) | 153 | if (sp.Firstname == names[0] && sp.Lastname == names[1]) |
| 154 | { | 154 | { |