diff options
| author | Diva Canto | 2012-03-20 21:36:46 -0700 |
|---|---|---|
| committer | Diva Canto | 2012-03-20 21:36:46 -0700 |
| commit | 5abe1b4fceed20af8a4330c248aad0d81f9c95ce (patch) | |
| tree | fe7c729ae8b3b579f0bb647d30574204e8893db3 /OpenSim/Region/Framework/Scenes/ScenePresence.cs | |
| parent | HG Friends config for Robust.HG.ini.example (diff) | |
| parent | If "debug scene updates true" then print out to log when a garbage collection... (diff) | |
| download | opensim-SC_OLD-5abe1b4fceed20af8a4330c248aad0d81f9c95ce.zip opensim-SC_OLD-5abe1b4fceed20af8a4330c248aad0d81f9c95ce.tar.gz opensim-SC_OLD-5abe1b4fceed20af8a4330c248aad0d81f9c95ce.tar.bz2 opensim-SC_OLD-5abe1b4fceed20af8a4330c248aad0d81f9c95ce.tar.xz | |
Merge branch 'master' of ssh://opensimulator.org/var/git/opensim
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 704d12d..cf60c69 100644 --- a/OpenSim/Region/Framework/Scenes/ScenePresence.cs +++ b/OpenSim/Region/Framework/Scenes/ScenePresence.cs | |||
| @@ -3826,7 +3826,7 @@ namespace OpenSim.Region.Framework.Scenes | |||
| 3826 | ILandObject land = m_scene.LandChannel.GetLandObject(pos.X, pos.Y); | 3826 | ILandObject land = m_scene.LandChannel.GetLandObject(pos.X, pos.Y); |
| 3827 | if (land != null) | 3827 | if (land != null) |
| 3828 | { | 3828 | { |
| 3829 | if (Scene.DEBUG) | 3829 | if (Scene.DebugTeleporting) |
| 3830 | TeleportFlagsDebug(); | 3830 | TeleportFlagsDebug(); |
| 3831 | 3831 | ||
| 3832 | // If we come in via login, landmark or map, we want to | 3832 | // If we come in via login, landmark or map, we want to |