diff options
| author | Melanie | 2012-03-22 20:38:49 +0000 |
|---|---|---|
| committer | Melanie | 2012-03-22 20:38:49 +0000 |
| commit | 33818994810130117bae62ba2123bf8b55f181ea (patch) | |
| tree | eeb54ef00919abbd1a86b08a659570512856ac42 /OpenSim/Region/Framework/Scenes/ScenePresence.cs | |
| parent | Revert "Stop messing order of updates, destroing the defined order of the sel... (diff) | |
| parent | Rework Diva's patch to simplify it (diff) | |
| download | opensim-SC-33818994810130117bae62ba2123bf8b55f181ea.zip opensim-SC-33818994810130117bae62ba2123bf8b55f181ea.tar.gz opensim-SC-33818994810130117bae62ba2123bf8b55f181ea.tar.bz2 opensim-SC-33818994810130117bae62ba2123bf8b55f181ea.tar.xz | |
Merge branch 'master' into careminster
Conflicts:
OpenSim/Region/CoreModules/World/Land/LandObject.cs
OpenSim/Region/ScriptEngine/Shared/Api/Implementation/LSL_Api.cs
Diffstat (limited to 'OpenSim/Region/Framework/Scenes/ScenePresence.cs')
| -rw-r--r-- | OpenSim/Region/Framework/Scenes/ScenePresence.cs | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/OpenSim/Region/Framework/Scenes/ScenePresence.cs b/OpenSim/Region/Framework/Scenes/ScenePresence.cs index 0847994..2346c60 100644 --- a/OpenSim/Region/Framework/Scenes/ScenePresence.cs +++ b/OpenSim/Region/Framework/Scenes/ScenePresence.cs | |||
| @@ -3920,7 +3920,7 @@ namespace OpenSim.Region.Framework.Scenes | |||
| 3920 | ILandObject land = m_scene.LandChannel.GetLandObject(pos.X, pos.Y); | 3920 | ILandObject land = m_scene.LandChannel.GetLandObject(pos.X, pos.Y); |
| 3921 | if (land != null) | 3921 | if (land != null) |
| 3922 | { | 3922 | { |
| 3923 | if (Scene.DEBUG) | 3923 | if (Scene.DebugTeleporting) |
| 3924 | TeleportFlagsDebug(); | 3924 | TeleportFlagsDebug(); |
| 3925 | 3925 | ||
| 3926 | // If we come in via login, landmark or map, we want to | 3926 | // If we come in via login, landmark or map, we want to |