diff options
| author | Melanie | 2012-06-06 13:07:05 +0100 |
|---|---|---|
| committer | Melanie | 2012-06-06 13:07:05 +0100 |
| commit | e733fb32cf76672cfddc25b3c9c02c50c025e2db (patch) | |
| tree | 1535c9e7d70cdb5f2e0779db8fc85fb98ede7ca5 /OpenSim/Region/ScriptEngine | |
| parent | Merge branch 'master' into careminster (diff) | |
| parent | minor: Change log messages on Warp3DImageModule to show they are from this mo... (diff) | |
| download | opensim-SC-e733fb32cf76672cfddc25b3c9c02c50c025e2db.zip opensim-SC-e733fb32cf76672cfddc25b3c9c02c50c025e2db.tar.gz opensim-SC-e733fb32cf76672cfddc25b3c9c02c50c025e2db.tar.bz2 opensim-SC-e733fb32cf76672cfddc25b3c9c02c50c025e2db.tar.xz | |
Merge branch 'master' into careminster
Conflicts:
OpenSim/Region/CoreModules/World/Warp3DMap/Warp3DImageModule.cs
OpenSim/Region/Framework/Scenes/Scene.cs
OpenSim/Region/Framework/Scenes/SimStatsReporter.cs
Diffstat (limited to 'OpenSim/Region/ScriptEngine')
| -rw-r--r-- | OpenSim/Region/ScriptEngine/Shared/Api/Implementation/LSL_Api.cs | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/OpenSim/Region/ScriptEngine/Shared/Api/Implementation/LSL_Api.cs b/OpenSim/Region/ScriptEngine/Shared/Api/Implementation/LSL_Api.cs index 3b8efd5..9595d48 100644 --- a/OpenSim/Region/ScriptEngine/Shared/Api/Implementation/LSL_Api.cs +++ b/OpenSim/Region/ScriptEngine/Shared/Api/Implementation/LSL_Api.cs | |||
| @@ -6038,7 +6038,6 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api | |||
| 6038 | } | 6038 | } |
| 6039 | } | 6039 | } |
| 6040 | } | 6040 | } |
| 6041 | List<UUID> presenceIds = new List<UUID>(); | ||
| 6042 | 6041 | ||
| 6043 | World.ForEachRootScenePresence( | 6042 | World.ForEachRootScenePresence( |
| 6044 | delegate (ScenePresence ssp) | 6043 | delegate (ScenePresence ssp) |