aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim
diff options
context:
space:
mode:
authorUbitUmarov2014-10-21 19:22:51 +0100
committerUbitUmarov2014-10-21 19:22:51 +0100
commit31c036c04405d04aac5da19ca45fb2cb73d43dd7 (patch)
tree868dfbaa00b9055b8be31b5562720488b55f931c /OpenSim
parentmake sure we return false if catch() is triggered on crossing (diff)
downloadopensim-SC_OLD-31c036c04405d04aac5da19ca45fb2cb73d43dd7.zip
opensim-SC_OLD-31c036c04405d04aac5da19ca45fb2cb73d43dd7.tar.gz
opensim-SC_OLD-31c036c04405d04aac5da19ca45fb2cb73d43dd7.tar.bz2
opensim-SC_OLD-31c036c04405d04aac5da19ca45fb2cb73d43dd7.tar.xz
refuse crossings if logins disabled
Please enter the commit message for your changes. Lines starting
Diffstat (limited to 'OpenSim')
-rw-r--r--OpenSim/Region/Framework/Scenes/Scene.cs7
1 files changed, 7 insertions, 0 deletions
diff --git a/OpenSim/Region/Framework/Scenes/Scene.cs b/OpenSim/Region/Framework/Scenes/Scene.cs
index 4a6f72c..9e2f52c 100644
--- a/OpenSim/Region/Framework/Scenes/Scene.cs
+++ b/OpenSim/Region/Framework/Scenes/Scene.cs
@@ -4532,6 +4532,13 @@ namespace OpenSim.Region.Framework.Scenes
4532 m_log.DebugFormat( 4532 m_log.DebugFormat(
4533 "[SCENE]: Incoming child agent update for {0} in {1}", cAgentData.AgentID, RegionInfo.RegionName); 4533 "[SCENE]: Incoming child agent update for {0} in {1}", cAgentData.AgentID, RegionInfo.RegionName);
4534 4534
4535 if (!LoginsEnabled)
4536 {
4537// reason = "Logins Disabled";
4538 m_log.DebugFormat(
4539 "[SCENE]: update for {0} in {1} refused: Logins Disabled", cAgentData.AgentID, RegionInfo.RegionName);
4540 return false;
4541 }
4535 // We have to wait until the viewer contacts this region after receiving EAC. 4542 // We have to wait until the viewer contacts this region after receiving EAC.
4536 // That calls AddNewClient, which finally creates the ScenePresence 4543 // That calls AddNewClient, which finally creates the ScenePresence
4537 int flags = GetUserFlags(cAgentData.AgentID); 4544 int flags = GetUserFlags(cAgentData.AgentID);