aboutsummaryrefslogtreecommitdiffstatshomepage
diff options
context:
space:
mode:
authorJustin Clark-Casey (justincc)2011-08-12 22:46:42 +0100
committerJustin Clark-Casey (justincc)2011-08-12 22:46:42 +0100
commit4b88f04c0afd36f9e88680bbafb7ccc4680fd504 (patch)
treec3cb373eafd04736ca7ff788237143b420ec2c7f
parenttidy up some OSSL NPC parameter names (diff)
downloadopensim-SC_OLD-4b88f04c0afd36f9e88680bbafb7ccc4680fd504.zip
opensim-SC_OLD-4b88f04c0afd36f9e88680bbafb7ccc4680fd504.tar.gz
opensim-SC_OLD-4b88f04c0afd36f9e88680bbafb7ccc4680fd504.tar.bz2
opensim-SC_OLD-4b88f04c0afd36f9e88680bbafb7ccc4680fd504.tar.xz
minor: On "login disable/enable" always tell the user the final login status, rather than remaining silent if it was already on/off
-rw-r--r--OpenSim/Region/CoreModules/World/Access/AccessModule.cs6
-rw-r--r--OpenSim/Region/OptionalModules/World/NPC/NPCModule.cs6
2 files changed, 5 insertions, 7 deletions
diff --git a/OpenSim/Region/CoreModules/World/Access/AccessModule.cs b/OpenSim/Region/CoreModules/World/Access/AccessModule.cs
index c355b13..b5e1fd9 100644
--- a/OpenSim/Region/CoreModules/World/Access/AccessModule.cs
+++ b/OpenSim/Region/CoreModules/World/Access/AccessModule.cs
@@ -129,13 +129,11 @@ namespace OpenSim.Region.CoreModules.World
129 switch (cmd[1]) 129 switch (cmd[1])
130 { 130 {
131 case "enable": 131 case "enable":
132 if (scene.LoginsDisabled) 132 MainConsole.Instance.Output(String.Format("Logins are enabled for region {0}", scene.RegionInfo.RegionName));
133 MainConsole.Instance.Output(String.Format("Enabling logins for region {0}", scene.RegionInfo.RegionName));
134 scene.LoginsDisabled = false; 133 scene.LoginsDisabled = false;
135 break; 134 break;
136 case "disable": 135 case "disable":
137 if (!scene.LoginsDisabled) 136 MainConsole.Instance.Output(String.Format("Logins are disabled for region {0}", scene.RegionInfo.RegionName));
138 MainConsole.Instance.Output(String.Format("Disabling logins for region {0}", scene.RegionInfo.RegionName));
139 scene.LoginsDisabled = true; 137 scene.LoginsDisabled = true;
140 break; 138 break;
141 case "status": 139 case "status":
diff --git a/OpenSim/Region/OptionalModules/World/NPC/NPCModule.cs b/OpenSim/Region/OptionalModules/World/NPC/NPCModule.cs
index c764c20..11fda6d 100644
--- a/OpenSim/Region/OptionalModules/World/NPC/NPCModule.cs
+++ b/OpenSim/Region/OptionalModules/World/NPC/NPCModule.cs
@@ -105,9 +105,9 @@ namespace OpenSim.Region.OptionalModules.World.NPC
105 } 105 }
106 else 106 else
107 { 107 {
108 m_log.DebugFormat( 108// m_log.DebugFormat(
109 "[NPC MODULE]: Updating npc {0} at {1} for next movement to {2}", 109// "[NPC MODULE]: Updating npc {0} at {1} for next movement to {2}",
110 presence.Name, presence.AbsolutePosition, presence.MoveToPositionTarget); 110// presence.Name, presence.AbsolutePosition, presence.MoveToPositionTarget);
111 111
112 Vector3 agent_control_v3 = new Vector3(); 112 Vector3 agent_control_v3 = new Vector3();
113 presence.HandleMoveToTargetUpdate(ref agent_control_v3); 113 presence.HandleMoveToTargetUpdate(ref agent_control_v3);