OpenSim
/
OpenSimMirror
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Merge branch 'master' of ssh://opensimulator.org/var/git/opensim

user_profiles
Diva Canto 2013-02-19 17:04:43 -08:00
parent 66bc526e4c 05a0998f57
commit c5cbf862f9
6 changed files with 39 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
OpenSim/Region/ClientStack/Linden/Caps/BunchOfCaps/BunchOfCaps.cs
View File

@ -912,7 +912,7 @@ namespace OpenSim.Region.ClientStack.Linden
string param, IOSHttpRequest httpRequest, string param, IOSHttpRequest httpRequest,
IOSHttpResponse httpResponse) IOSHttpResponse httpResponse)
{ {
OSDMap req = (OSDMap)OSDParser.DeserializeLLSDXml(request); // OSDMap req = (OSDMap)OSDParser.DeserializeLLSDXml(request);
OSDMap resp = new OSDMap(); OSDMap resp = new OSDMap();
OSDMap accessPrefs = new OSDMap(); OSDMap accessPrefs = new OSDMap();

8
OpenSim/Region/ClientStack/Linden/Caps/RegionConsoleModule.cs
View File

@ -56,8 +56,8 @@ namespace OpenSim.Region.ClientStack.Linden
[Extension(Path = "/OpenSim/RegionModules", NodeName = "RegionModule", Id = "RegionConsoleModule")] [Extension(Path = "/OpenSim/RegionModules", NodeName = "RegionModule", Id = "RegionConsoleModule")]
public class RegionConsoleModule : INonSharedRegionModule, IRegionConsole public class RegionConsoleModule : INonSharedRegionModule, IRegionConsole
{ {
private static readonly ILog m_log = // private static readonly ILog m_log =
LogManager.GetLogger(MethodBase.GetCurrentMethod().DeclaringType); // LogManager.GetLogger(MethodBase.GetCurrentMethod().DeclaringType);
private Scene m_scene; private Scene m_scene;
private IEventQueue m_eventQueue; private IEventQueue m_eventQueue;
@ -157,8 +157,8 @@ namespace OpenSim.Region.ClientStack.Linden
public class ConsoleHandler : BaseStreamHandler public class ConsoleHandler : BaseStreamHandler
{ {
private static readonly ILog m_log = // private static readonly ILog m_log =
LogManager.GetLogger(MethodBase.GetCurrentMethod().DeclaringType); // LogManager.GetLogger(MethodBase.GetCurrentMethod().DeclaringType);
private RegionConsoleModule m_consoleModule; private RegionConsoleModule m_consoleModule;
private UUID m_agentID; private UUID m_agentID;

20
OpenSim/Region/OptionalModules/Scripting/JsonStore/Tests/JsonStoreScriptModuleTests.cs
View File

@ -158,8 +158,8 @@ namespace OpenSim.Region.OptionalModules.Scripting.JsonStore.Tests
Assert.That(dsrv, Is.EqualTo(1)); Assert.That(dsrv, Is.EqualTo(1));
int tprv = (int)InvokeOp("JsonTestPath", storeId, "Hello"); int tprv = (int)InvokeOp("JsonGetPathType", storeId, "Hello");
Assert.That(tprv, Is.EqualTo(0)); Assert.That(tprv, Is.EqualTo(JsonStoreScriptModule.JSON_TYPE_UNDEF));
} }
[Test] [Test]
@ -277,8 +277,8 @@ namespace OpenSim.Region.OptionalModules.Scripting.JsonStore.Tests
int returnValue = (int)InvokeOp( "JsonRemoveValue", storeId, "Hello"); int returnValue = (int)InvokeOp( "JsonRemoveValue", storeId, "Hello");
Assert.That(returnValue, Is.EqualTo(1)); Assert.That(returnValue, Is.EqualTo(1));
int result = (int)InvokeOp("JsonTestPath", storeId, "Hello"); int result = (int)InvokeOp("JsonGetPathType", storeId, "Hello");
Assert.That(result, Is.EqualTo(0)); Assert.That(result, Is.EqualTo(JsonStoreScriptModule.JSON_TYPE_UNDEF));
string returnValue2 = (string)InvokeOp("JsonGetValue", storeId, "Hello"); string returnValue2 = (string)InvokeOp("JsonGetValue", storeId, "Hello");
Assert.That(returnValue2, Is.EqualTo("")); Assert.That(returnValue2, Is.EqualTo(""));
@ -291,8 +291,8 @@ namespace OpenSim.Region.OptionalModules.Scripting.JsonStore.Tests
int returnValue = (int)InvokeOp( "JsonRemoveValue", storeId, "Hello"); int returnValue = (int)InvokeOp( "JsonRemoveValue", storeId, "Hello");
Assert.That(returnValue, Is.EqualTo(1)); Assert.That(returnValue, Is.EqualTo(1));
int result = (int)InvokeOp("JsonTestPath", storeId, "Hello"); int result = (int)InvokeOp("JsonGetPathType", storeId, "Hello");
Assert.That(result, Is.EqualTo(0)); Assert.That(result, Is.EqualTo(JsonStoreScriptModule.JSON_TYPE_UNDEF));
string returnValue2 = (string)InvokeOp("JsonGetJson", storeId, "Hello"); string returnValue2 = (string)InvokeOp("JsonGetJson", storeId, "Hello");
Assert.That(returnValue2, Is.EqualTo("")); Assert.That(returnValue2, Is.EqualTo(""));
@ -306,11 +306,11 @@ namespace OpenSim.Region.OptionalModules.Scripting.JsonStore.Tests
int returnValue = (int)InvokeOp( "JsonRemoveValue", storeId, "Hello[0]"); int returnValue = (int)InvokeOp( "JsonRemoveValue", storeId, "Hello[0]");
Assert.That(returnValue, Is.EqualTo(1)); Assert.That(returnValue, Is.EqualTo(1));
int result = (int)InvokeOp("JsonTestPath", storeId, "Hello[0]"); int result = (int)InvokeOp("JsonGetPathType", storeId, "Hello[0]");
Assert.That(result, Is.EqualTo(1)); Assert.That(result, Is.EqualTo(JsonStoreScriptModule.JSON_TYPE_VALUE));
result = (int)InvokeOp("JsonTestPath", storeId, "Hello[1]"); result = (int)InvokeOp("JsonGetPathType", storeId, "Hello[1]");
Assert.That(result, Is.EqualTo(0)); Assert.That(result, Is.EqualTo(JsonStoreScriptModule.JSON_TYPE_UNDEF));
string stringReturnValue = (string)InvokeOp("JsonGetValue", storeId, "Hello[0]"); string stringReturnValue = (string)InvokeOp("JsonGetValue", storeId, "Hello[0]");
Assert.That(stringReturnValue, Is.EqualTo("value2")); Assert.That(stringReturnValue, Is.EqualTo("value2"));

15
OpenSim/Services/LLLoginService/LLLoginService.cs
View File

@ -961,14 +961,25 @@ namespace OpenSim.Services.LLLoginService
// or fixing critical issues // or fixing critical issues
// //
if (cmd.Length > 2) if (cmd.Length > 2)
Int32.TryParse(cmd[2], out m_MinLoginLevel); {
if (Int32.TryParse(cmd[2], out m_MinLoginLevel))
MainConsole.Instance.OutputFormat("Set minimum login level to {0}", m_MinLoginLevel);
else
MainConsole.Instance.OutputFormat("ERROR: {0} is not a valid login level", cmd[2]);
}
break; break;
case "reset":
case "reset":
m_MinLoginLevel = 0; m_MinLoginLevel = 0;
MainConsole.Instance.OutputFormat("Reset min login level to {0}", m_MinLoginLevel);
break; break;
case "text": case "text":
if (cmd.Length > 2) if (cmd.Length > 2)
{
m_WelcomeMessage = cmd[2]; m_WelcomeMessage = cmd[2];
MainConsole.Instance.OutputFormat("Login welcome message set to '{0}'", m_WelcomeMessage);
}
break; break;
} }
} }

7
bin/Robust.ini.example
View File

@ -261,7 +261,12 @@ MapGetServiceConnector = "8002/OpenSim.Server.Handlers.dll:MapGetServiceConnecto
LibraryService = "OpenSim.Services.InventoryService.dll:LibraryService" LibraryService = "OpenSim.Services.InventoryService.dll:LibraryService"
FriendsService = "OpenSim.Services.FriendsService.dll:FriendsService" FriendsService = "OpenSim.Services.FriendsService.dll:FriendsService"
;; Ask co-operative viewers to use a different currency name ; The minimum user level required for a user to be able to login. 0 by default
; If you disable a particular user's account then you can set their login level below this number.
; You can also change this level from the console though these changes will not be persisted.
; MinLoginLevel = 0
; Ask co-operative viewers to use a different currency name
;Currency = "" ;Currency = ""
WelcomeMessage = "Welcome, Avatar!" WelcomeMessage = "Welcome, Avatar!"

5
bin/config-include/StandaloneCommon.ini.example
View File

@ -85,6 +85,11 @@
;; For Viewer 2 ;; For Viewer 2
MapTileURL = "http://127.0.0.1:9000/" MapTileURL = "http://127.0.0.1:9000/"
; The minimum user level required for a user to be able to login. 0 by default
; If you disable a particular user's account then you can set their login level below this number.
; You can also change this level from the console though these changes will not be persisted.
; MinLoginLevel = 0
;; Ask co-operative viewers to use a different currency name ;; Ask co-operative viewers to use a different currency name
;Currency = "" ;Currency = ""