aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Region/Framework/Scenes/Scene.cs
diff options
context:
space:
mode:
Diffstat (limited to 'OpenSim/Region/Framework/Scenes/Scene.cs')
-rw-r--r--OpenSim/Region/Framework/Scenes/Scene.cs5
1 files changed, 3 insertions, 2 deletions
diff --git a/OpenSim/Region/Framework/Scenes/Scene.cs b/OpenSim/Region/Framework/Scenes/Scene.cs
index 4de494f..fc1e85a 100644
--- a/OpenSim/Region/Framework/Scenes/Scene.cs
+++ b/OpenSim/Region/Framework/Scenes/Scene.cs
@@ -65,6 +65,7 @@ namespace OpenSim.Region.Framework.Scenes
65 #region Fields 65 #region Fields
66 66
67 public bool EmergencyMonitoring = false; 67 public bool EmergencyMonitoring = false;
68 public bool DEBUG = false;
68 69
69 public SynchronizeSceneHandler SynchronizeScene; 70 public SynchronizeSceneHandler SynchronizeScene;
70 public SimStatsReporter StatsReporter; 71 public SimStatsReporter StatsReporter;
@@ -2652,7 +2653,7 @@ namespace OpenSim.Region.Framework.Scenes
2652 sp = m_sceneGraph.CreateAndAddChildScenePresence(client, aCircuit.Appearance, type); 2653 sp = m_sceneGraph.CreateAndAddChildScenePresence(client, aCircuit.Appearance, type);
2653 m_eventManager.TriggerOnNewPresence(sp); 2654 m_eventManager.TriggerOnNewPresence(sp);
2654 2655
2655 sp.TeleportFlags = (TeleportFlags)aCircuit.teleportFlags; 2656 sp.TeleportFlags = (TPFlags)aCircuit.teleportFlags;
2656 2657
2657 // The first agent upon login is a root agent by design. 2658 // The first agent upon login is a root agent by design.
2658 // For this agent we will have to rez the attachments. 2659 // For this agent we will have to rez the attachments.
@@ -3478,7 +3479,7 @@ namespace OpenSim.Region.Framework.Scenes
3478 { 3479 {
3479 // Let the SP know how we got here. This has a lot of interesting 3480 // Let the SP know how we got here. This has a lot of interesting
3480 // uses down the line. 3481 // uses down the line.
3481 sp.TeleportFlags = (TeleportFlags)teleportFlags; 3482 sp.TeleportFlags = (TPFlags)teleportFlags;
3482 3483
3483 if (sp.IsChildAgent) 3484 if (sp.IsChildAgent)
3484 { 3485 {