aboutsummaryrefslogtreecommitdiffstatshomepage
diff options
context:
space:
mode:
authorUbitUmarov2015-09-15 22:24:50 +0100
committerUbitUmarov2015-09-15 22:24:50 +0100
commit3906bb2749fd6f01a9fd9e7127acb0ba04802e63 (patch)
tree07b2f2da829a83d4a99a6b0f5d033612b2246470
parentfix bad side efects of missing avination optional configuration (diff)
downloadopensim-SC_OLD-3906bb2749fd6f01a9fd9e7127acb0ba04802e63.zip
opensim-SC_OLD-3906bb2749fd6f01a9fd9e7127acb0ba04802e63.tar.gz
opensim-SC_OLD-3906bb2749fd6f01a9fd9e7127acb0ba04802e63.tar.bz2
opensim-SC_OLD-3906bb2749fd6f01a9fd9e7127acb0ba04802e63.tar.xz
fix missing check for viaHGLogin
-rw-r--r--OpenSim/Region/Framework/Scenes/ScenePresence.cs4
1 files changed, 2 insertions, 2 deletions
diff --git a/OpenSim/Region/Framework/Scenes/ScenePresence.cs b/OpenSim/Region/Framework/Scenes/ScenePresence.cs
index 6210db0..f63fa71 100644
--- a/OpenSim/Region/Framework/Scenes/ScenePresence.cs
+++ b/OpenSim/Region/Framework/Scenes/ScenePresence.cs
@@ -1786,7 +1786,7 @@ namespace OpenSim.Region.Framework.Scenes
1786 try 1786 try
1787 { 1787 {
1788 // Make sure it's not a login agent. We don't want to wait for updates during login 1788 // Make sure it's not a login agent. We don't want to wait for updates during login
1789 if (!isNPC && (m_teleportFlags & TeleportFlags.ViaLogin) == 0) 1789 if (!isNPC && !IsRealLogin(m_teleportFlags))
1790 { 1790 {
1791 1791
1792 // Let's wait until UpdateAgent (called by departing region) is done 1792 // Let's wait until UpdateAgent (called by departing region) is done
@@ -1956,7 +1956,7 @@ namespace OpenSim.Region.Framework.Scenes
1956 1956
1957 // attachments 1957 // attachments
1958 1958
1959 if (isNPC || (TeleportFlags & TeleportFlags.ViaLogin) != 0) 1959 if (isNPC || IsRealLogin(m_teleportFlags))
1960 { 1960 {
1961 if (Scene.AttachmentsModule != null) 1961 if (Scene.AttachmentsModule != null)
1962 // Util.FireAndForget( 1962 // Util.FireAndForget(