diff options
| author | UbitUmarov | 2012-03-23 03:41:48 +0000 |
|---|---|---|
| committer | UbitUmarov | 2012-03-23 03:41:48 +0000 |
| commit | 4db05a98c2c1678b612e0a3d2f95c24e34ac5f13 (patch) | |
| tree | 3929bd993c504a3de7697f449e36535aeeddf737 /OpenSim/Region/Framework/Scenes/ScenePresence.cs | |
| parent | Merge branch 'master' of ssh://3dhosting.de/var/git/careminster into ubitwork (diff) | |
| parent | Merge branch 'master' into careminster (diff) | |
| download | opensim-SC-4db05a98c2c1678b612e0a3d2f95c24e34ac5f13.zip opensim-SC-4db05a98c2c1678b612e0a3d2f95c24e34ac5f13.tar.gz opensim-SC-4db05a98c2c1678b612e0a3d2f95c24e34ac5f13.tar.bz2 opensim-SC-4db05a98c2c1678b612e0a3d2f95c24e34ac5f13.tar.xz | |
Merge branch 'master' of ssh://3dhosting.de/var/git/careminster into ubitwork
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 |