diff options
author | Diva Canto | 2013-02-19 17:04:43 -0800 |
---|---|---|
committer | Diva Canto | 2013-02-19 17:04:43 -0800 |
commit | c5cbf862f96817ffa5e588f70da78fd4adc859f4 (patch) | |
tree | f26ca275b6558ee05f8691e9a2d2bdc39bb5a089 /OpenSim | |
parent | Updated AssemblyInfo.cs for Groups and OfflineIM to 0.7.6.*. Removed Assembly... (diff) | |
parent | Give the user some feedback about the success or failure of console login pro... (diff) | |
download | opensim-SC_OLD-c5cbf862f96817ffa5e588f70da78fd4adc859f4.zip opensim-SC_OLD-c5cbf862f96817ffa5e588f70da78fd4adc859f4.tar.gz opensim-SC_OLD-c5cbf862f96817ffa5e588f70da78fd4adc859f4.tar.bz2 opensim-SC_OLD-c5cbf862f96817ffa5e588f70da78fd4adc859f4.tar.xz |
Merge branch 'master' of ssh://opensimulator.org/var/git/opensim
Diffstat (limited to '')
4 files changed, 28 insertions, 17 deletions
diff --git a/OpenSim/Region/ClientStack/Linden/Caps/BunchOfCaps/BunchOfCaps.cs b/OpenSim/Region/ClientStack/Linden/Caps/BunchOfCaps/BunchOfCaps.cs index 1af61db..20df8a6 100644 --- a/OpenSim/Region/ClientStack/Linden/Caps/BunchOfCaps/BunchOfCaps.cs +++ b/OpenSim/Region/ClientStack/Linden/Caps/BunchOfCaps/BunchOfCaps.cs | |||
@@ -912,7 +912,7 @@ namespace OpenSim.Region.ClientStack.Linden | |||
912 | string param, IOSHttpRequest httpRequest, | 912 | string param, IOSHttpRequest httpRequest, |
913 | IOSHttpResponse httpResponse) | 913 | IOSHttpResponse httpResponse) |
914 | { | 914 | { |
915 | OSDMap req = (OSDMap)OSDParser.DeserializeLLSDXml(request); | 915 | // OSDMap req = (OSDMap)OSDParser.DeserializeLLSDXml(request); |
916 | OSDMap resp = new OSDMap(); | 916 | OSDMap resp = new OSDMap(); |
917 | 917 | ||
918 | OSDMap accessPrefs = new OSDMap(); | 918 | OSDMap accessPrefs = new OSDMap(); |
diff --git a/OpenSim/Region/ClientStack/Linden/Caps/RegionConsoleModule.cs b/OpenSim/Region/ClientStack/Linden/Caps/RegionConsoleModule.cs index 17c7270..69dd76f 100644 --- a/OpenSim/Region/ClientStack/Linden/Caps/RegionConsoleModule.cs +++ b/OpenSim/Region/ClientStack/Linden/Caps/RegionConsoleModule.cs | |||
@@ -56,8 +56,8 @@ namespace OpenSim.Region.ClientStack.Linden | |||
56 | [Extension(Path = "/OpenSim/RegionModules", NodeName = "RegionModule", Id = "RegionConsoleModule")] | 56 | [Extension(Path = "/OpenSim/RegionModules", NodeName = "RegionModule", Id = "RegionConsoleModule")] |
57 | public class RegionConsoleModule : INonSharedRegionModule, IRegionConsole | 57 | public class RegionConsoleModule : INonSharedRegionModule, IRegionConsole |
58 | { | 58 | { |
59 | private static readonly ILog m_log = | 59 | // private static readonly ILog m_log = |
60 | LogManager.GetLogger(MethodBase.GetCurrentMethod().DeclaringType); | 60 | // LogManager.GetLogger(MethodBase.GetCurrentMethod().DeclaringType); |
61 | 61 | ||
62 | private Scene m_scene; | 62 | private Scene m_scene; |
63 | private IEventQueue m_eventQueue; | 63 | private IEventQueue m_eventQueue; |
@@ -157,8 +157,8 @@ namespace OpenSim.Region.ClientStack.Linden | |||
157 | 157 | ||
158 | public class ConsoleHandler : BaseStreamHandler | 158 | public class ConsoleHandler : BaseStreamHandler |
159 | { | 159 | { |
160 | private static readonly ILog m_log = | 160 | // private static readonly ILog m_log = |
161 | LogManager.GetLogger(MethodBase.GetCurrentMethod().DeclaringType); | 161 | // LogManager.GetLogger(MethodBase.GetCurrentMethod().DeclaringType); |
162 | 162 | ||
163 | private RegionConsoleModule m_consoleModule; | 163 | private RegionConsoleModule m_consoleModule; |
164 | private UUID m_agentID; | 164 | private UUID m_agentID; |
diff --git a/OpenSim/Region/OptionalModules/Scripting/JsonStore/Tests/JsonStoreScriptModuleTests.cs b/OpenSim/Region/OptionalModules/Scripting/JsonStore/Tests/JsonStoreScriptModuleTests.cs index db82d4b..b64dbd4 100644 --- a/OpenSim/Region/OptionalModules/Scripting/JsonStore/Tests/JsonStoreScriptModuleTests.cs +++ b/OpenSim/Region/OptionalModules/Scripting/JsonStore/Tests/JsonStoreScriptModuleTests.cs | |||
@@ -158,8 +158,8 @@ namespace OpenSim.Region.OptionalModules.Scripting.JsonStore.Tests | |||
158 | 158 | ||
159 | Assert.That(dsrv, Is.EqualTo(1)); | 159 | Assert.That(dsrv, Is.EqualTo(1)); |
160 | 160 | ||
161 | int tprv = (int)InvokeOp("JsonTestPath", storeId, "Hello"); | 161 | int tprv = (int)InvokeOp("JsonGetPathType", storeId, "Hello"); |
162 | Assert.That(tprv, Is.EqualTo(0)); | 162 | Assert.That(tprv, Is.EqualTo(JsonStoreScriptModule.JSON_TYPE_UNDEF)); |
163 | } | 163 | } |
164 | 164 | ||
165 | [Test] | 165 | [Test] |
@@ -277,8 +277,8 @@ namespace OpenSim.Region.OptionalModules.Scripting.JsonStore.Tests | |||
277 | int returnValue = (int)InvokeOp( "JsonRemoveValue", storeId, "Hello"); | 277 | int returnValue = (int)InvokeOp( "JsonRemoveValue", storeId, "Hello"); |
278 | Assert.That(returnValue, Is.EqualTo(1)); | 278 | Assert.That(returnValue, Is.EqualTo(1)); |
279 | 279 | ||
280 | int result = (int)InvokeOp("JsonTestPath", storeId, "Hello"); | 280 | int result = (int)InvokeOp("JsonGetPathType", storeId, "Hello"); |
281 | Assert.That(result, Is.EqualTo(0)); | 281 | Assert.That(result, Is.EqualTo(JsonStoreScriptModule.JSON_TYPE_UNDEF)); |
282 | 282 | ||
283 | string returnValue2 = (string)InvokeOp("JsonGetValue", storeId, "Hello"); | 283 | string returnValue2 = (string)InvokeOp("JsonGetValue", storeId, "Hello"); |
284 | Assert.That(returnValue2, Is.EqualTo("")); | 284 | Assert.That(returnValue2, Is.EqualTo("")); |
@@ -291,8 +291,8 @@ namespace OpenSim.Region.OptionalModules.Scripting.JsonStore.Tests | |||
291 | int returnValue = (int)InvokeOp( "JsonRemoveValue", storeId, "Hello"); | 291 | int returnValue = (int)InvokeOp( "JsonRemoveValue", storeId, "Hello"); |
292 | Assert.That(returnValue, Is.EqualTo(1)); | 292 | Assert.That(returnValue, Is.EqualTo(1)); |
293 | 293 | ||
294 | int result = (int)InvokeOp("JsonTestPath", storeId, "Hello"); | 294 | int result = (int)InvokeOp("JsonGetPathType", storeId, "Hello"); |
295 | Assert.That(result, Is.EqualTo(0)); | 295 | Assert.That(result, Is.EqualTo(JsonStoreScriptModule.JSON_TYPE_UNDEF)); |
296 | 296 | ||
297 | string returnValue2 = (string)InvokeOp("JsonGetJson", storeId, "Hello"); | 297 | string returnValue2 = (string)InvokeOp("JsonGetJson", storeId, "Hello"); |
298 | Assert.That(returnValue2, Is.EqualTo("")); | 298 | Assert.That(returnValue2, Is.EqualTo("")); |
@@ -306,11 +306,11 @@ namespace OpenSim.Region.OptionalModules.Scripting.JsonStore.Tests | |||
306 | int returnValue = (int)InvokeOp( "JsonRemoveValue", storeId, "Hello[0]"); | 306 | int returnValue = (int)InvokeOp( "JsonRemoveValue", storeId, "Hello[0]"); |
307 | Assert.That(returnValue, Is.EqualTo(1)); | 307 | Assert.That(returnValue, Is.EqualTo(1)); |
308 | 308 | ||
309 | int result = (int)InvokeOp("JsonTestPath", storeId, "Hello[0]"); | 309 | int result = (int)InvokeOp("JsonGetPathType", storeId, "Hello[0]"); |
310 | Assert.That(result, Is.EqualTo(1)); | 310 | Assert.That(result, Is.EqualTo(JsonStoreScriptModule.JSON_TYPE_VALUE)); |
311 | 311 | ||
312 | result = (int)InvokeOp("JsonTestPath", storeId, "Hello[1]"); | 312 | result = (int)InvokeOp("JsonGetPathType", storeId, "Hello[1]"); |
313 | Assert.That(result, Is.EqualTo(0)); | 313 | Assert.That(result, Is.EqualTo(JsonStoreScriptModule.JSON_TYPE_UNDEF)); |
314 | 314 | ||
315 | string stringReturnValue = (string)InvokeOp("JsonGetValue", storeId, "Hello[0]"); | 315 | string stringReturnValue = (string)InvokeOp("JsonGetValue", storeId, "Hello[0]"); |
316 | Assert.That(stringReturnValue, Is.EqualTo("value2")); | 316 | Assert.That(stringReturnValue, Is.EqualTo("value2")); |
diff --git a/OpenSim/Services/LLLoginService/LLLoginService.cs b/OpenSim/Services/LLLoginService/LLLoginService.cs index 59fb559..5f30f84 100644 --- a/OpenSim/Services/LLLoginService/LLLoginService.cs +++ b/OpenSim/Services/LLLoginService/LLLoginService.cs | |||
@@ -961,14 +961,25 @@ namespace OpenSim.Services.LLLoginService | |||
961 | // or fixing critical issues | 961 | // or fixing critical issues |
962 | // | 962 | // |
963 | if (cmd.Length > 2) | 963 | if (cmd.Length > 2) |
964 | Int32.TryParse(cmd[2], out m_MinLoginLevel); | 964 | { |
965 | if (Int32.TryParse(cmd[2], out m_MinLoginLevel)) | ||
966 | MainConsole.Instance.OutputFormat("Set minimum login level to {0}", m_MinLoginLevel); | ||
967 | else | ||
968 | MainConsole.Instance.OutputFormat("ERROR: {0} is not a valid login level", cmd[2]); | ||
969 | } | ||
965 | break; | 970 | break; |
966 | case "reset": | 971 | |
972 | case "reset": | ||
967 | m_MinLoginLevel = 0; | 973 | m_MinLoginLevel = 0; |
974 | MainConsole.Instance.OutputFormat("Reset min login level to {0}", m_MinLoginLevel); | ||
968 | break; | 975 | break; |
976 | |||
969 | case "text": | 977 | case "text": |
970 | if (cmd.Length > 2) | 978 | if (cmd.Length > 2) |
979 | { | ||
971 | m_WelcomeMessage = cmd[2]; | 980 | m_WelcomeMessage = cmd[2]; |
981 | MainConsole.Instance.OutputFormat("Login welcome message set to '{0}'", m_WelcomeMessage); | ||
982 | } | ||
972 | break; | 983 | break; |
973 | } | 984 | } |
974 | } | 985 | } |