aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Region
diff options
context:
space:
mode:
authorUbitUmarov2018-08-26 03:11:32 +0100
committerUbitUmarov2018-08-26 03:11:32 +0100
commit58ba645160299a3693046992f672c4b9394ddd38 (patch)
treea189c559bcb965475bd5b445e48119d83895fe30 /OpenSim/Region
parentfix smoke asset filename (diff)
downloadopensim-SC-58ba645160299a3693046992f672c4b9394ddd38.zip
opensim-SC-58ba645160299a3693046992f672c4b9394ddd38.tar.gz
opensim-SC-58ba645160299a3693046992f672c4b9394ddd38.tar.bz2
opensim-SC-58ba645160299a3693046992f672c4b9394ddd38.tar.xz
mantis 8273 make change on crossings coerent
Diffstat (limited to 'OpenSim/Region')
-rw-r--r--OpenSim/Region/Framework/Scenes/ScenePresence.cs3
1 files changed, 3 insertions, 0 deletions
diff --git a/OpenSim/Region/Framework/Scenes/ScenePresence.cs b/OpenSim/Region/Framework/Scenes/ScenePresence.cs
index 17603b6..9c929a7 100644
--- a/OpenSim/Region/Framework/Scenes/ScenePresence.cs
+++ b/OpenSim/Region/Framework/Scenes/ScenePresence.cs
@@ -1533,6 +1533,7 @@ namespace OpenSim.Region.Framework.Scenes
1533*/ 1533*/
1534 public int GetStateSource() 1534 public int GetStateSource()
1535 { 1535 {
1536/*
1536 AgentCircuitData aCircuit = m_scene.AuthenticateHandler.GetAgentCircuitData(UUID); 1537 AgentCircuitData aCircuit = m_scene.AuthenticateHandler.GetAgentCircuitData(UUID);
1537 1538
1538 if (aCircuit != null && (aCircuit.teleportFlags != (uint)TeleportFlags.Default)) 1539 if (aCircuit != null && (aCircuit.teleportFlags != (uint)TeleportFlags.Default))
@@ -1543,6 +1544,8 @@ namespace OpenSim.Region.Framework.Scenes
1543 return 5; // StateSource.Teleporting 1544 return 5; // StateSource.Teleporting
1544 } 1545 }
1545 return 2; // StateSource.PrimCrossing 1546 return 2; // StateSource.PrimCrossing
1547*/
1548 return m_teleportFlags == TeleportFlags.Default ? 2 : 5;
1546 } 1549 }
1547 1550
1548 /// <summary> 1551 /// <summary>