From 504a69906b1ced5691128174fcebabc6d433294a Mon Sep 17 00:00:00 2001 From: Melanie Thielker Date: Tue, 3 Jan 2017 14:05:37 +0000 Subject: [PATCH 1/6] Suppress error messages in the log if functions are not enabled. Just return failure instead. --- .../Handlers/UserAccounts/UserAccountServerPostHandler.cs | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/OpenSim/Server/Handlers/UserAccounts/UserAccountServerPostHandler.cs b/OpenSim/Server/Handlers/UserAccounts/UserAccountServerPostHandler.cs index b22c4cc6fd..a02255f01d 100644 --- a/OpenSim/Server/Handlers/UserAccounts/UserAccountServerPostHandler.cs +++ b/OpenSim/Server/Handlers/UserAccounts/UserAccountServerPostHandler.cs @@ -98,7 +98,7 @@ namespace OpenSim.Server.Handlers.UserAccounts if (m_AllowCreateUser) return CreateUser(request); else - break; + return FailureResult(); case "getaccount": return GetAccount(request); case "getaccounts": @@ -109,7 +109,7 @@ namespace OpenSim.Server.Handlers.UserAccounts if (m_AllowSetAccount) return StoreAccount(request); else - break; + return FailureResult(); } m_log.DebugFormat("[USER SERVICE HANDLER]: unknown method request: {0}", method); From 995242b351a5460bbb6358f490a6679f7e660b42 Mon Sep 17 00:00:00 2001 From: Melanie Thielker Date: Tue, 3 Jan 2017 18:31:17 +0000 Subject: [PATCH 2/6] Suppress misleading message when logging in locally The gatekeeper and travel info address will not actually be set there, stop OpenSim from showing a blank address. It's confusing. --- OpenSim/Services/HypergridService/UserAgentService.cs | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/OpenSim/Services/HypergridService/UserAgentService.cs b/OpenSim/Services/HypergridService/UserAgentService.cs index 317d0066b3..e701ec6a81 100644 --- a/OpenSim/Services/HypergridService/UserAgentService.cs +++ b/OpenSim/Services/HypergridService/UserAgentService.cs @@ -301,8 +301,12 @@ namespace OpenSim.Services.HypergridService // Everything is ok - // Update the perceived IP Address of our grid - m_log.DebugFormat("[USER AGENT SERVICE]: Gatekeeper sees me as {0}", myExternalIP); + if (!fromLogin) + { + // Update the perceived IP Address of our grid + m_log.DebugFormat("[USER AGENT SERVICE]: Gatekeeper sees me as {0}", myExternalIP); + } + travel.MyIpAddress = myExternalIP; StoreTravelInfo(travel); From b0db5752202f8e8e56390ac0c062b9f500575290 Mon Sep 17 00:00:00 2001 From: Melanie Thielker Date: Wed, 4 Jan 2017 19:13:59 +0000 Subject: [PATCH 3/6] Set a sensible default for the MaxAgentGroups parameter MaxAgentGroups is in the [Groups] section, but is read by the login service. If the login service and the groups service don't share the same ini file, that will be sent to the viewer as zero and groups will not work. --- OpenSim/Services/LLLoginService/LLLoginService.cs | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/OpenSim/Services/LLLoginService/LLLoginService.cs b/OpenSim/Services/LLLoginService/LLLoginService.cs index 5d69705f79..80fc56fd8e 100644 --- a/OpenSim/Services/LLLoginService/LLLoginService.cs +++ b/OpenSim/Services/LLLoginService/LLLoginService.cs @@ -82,7 +82,7 @@ namespace OpenSim.Services.LLLoginService protected string m_SearchURL; protected string m_Currency; protected string m_ClassifiedFee; - protected int m_MaxAgentGroups; + protected int m_MaxAgentGroups = 42; protected string m_DestinationGuide; protected string m_AvatarPicker; protected string m_AllowedClients; From ed641b22b3c840cd133b71e069cb93cd4dce1d7d Mon Sep 17 00:00:00 2001 From: Mandarinka Tasty Date: Wed, 4 Jan 2017 20:06:41 +0100 Subject: [PATCH 4/6] Show details of scene objects with given ownerId. Signed-off-by: Mandarinka Tasty Signed-off-by: Melanie Thielker --- .../Objects/Commands/ObjectCommandsModule.cs | 35 +++++++++++++++++++ 1 file changed, 35 insertions(+) diff --git a/OpenSim/Region/CoreModules/World/Objects/Commands/ObjectCommandsModule.cs b/OpenSim/Region/CoreModules/World/Objects/Commands/ObjectCommandsModule.cs index 688648b965..e53ab95351 100644 --- a/OpenSim/Region/CoreModules/World/Objects/Commands/ObjectCommandsModule.cs +++ b/OpenSim/Region/CoreModules/World/Objects/Commands/ObjectCommandsModule.cs @@ -149,6 +149,15 @@ namespace OpenSim.Region.CoreModules.World.Objects.Commands + "If --regex is specified then the name is treatead as a regular expression.", HandleShowObjectByName); + m_console.Commands.AddCommand( + "Objects", + false, + "show object owner", + "show object owner [--full] ", + "Show details of scene objects with given owner.", + "The --full option will print out information on all the parts of the object.\n", + HandleShowObjectByOwnerID); + m_console.Commands.AddCommand( "Objects", false, @@ -325,6 +334,32 @@ namespace OpenSim.Region.CoreModules.World.Objects.Commands OutputSogsToConsole(searchPredicate, showFull); } + private void HandleShowObjectByOwnerID(string module, string[] cmdparams) + { + if (!(m_console.ConsoleScene == null || m_console.ConsoleScene == m_scene)) + return; + + bool showFull = false; + OptionSet options = new OptionSet().Add("full", v => showFull = v != null); + + List mainParams = options.Parse(cmdparams); + + if (mainParams.Count < 4) + { + m_console.OutputFormat("Usage: show object owner "); + return; + } + + UUID ownerID; + if (!ConsoleUtil.TryParseConsoleUuid(m_console, mainParams[3], out ownerID)) + return; + + Predicate searchPredicate + = so => so.OwnerID == ownerID && !so.IsAttachment; + + OutputSogsToConsole(searchPredicate, showFull); + } + private void HandleShowObjectByPos(string module, string[] cmdparams) { if (!(m_console.ConsoleScene == null || m_console.ConsoleScene == m_scene)) From af93822465d8d873b94f536e6e6d8ee5f7f9fdea Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Geir=20N=C3=B8klebye?= Date: Wed, 4 Jan 2017 21:32:09 +0100 Subject: [PATCH 5/6] PGSQL fixed a missing cast to uuid in XInventoryData Signed-off-by: Melanie Thielker --- OpenSim/Data/PGSQL/PGSQLXInventoryData.cs | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/OpenSim/Data/PGSQL/PGSQLXInventoryData.cs b/OpenSim/Data/PGSQL/PGSQLXInventoryData.cs index c34a8dce87..959c2cf393 100644 --- a/OpenSim/Data/PGSQL/PGSQLXInventoryData.cs +++ b/OpenSim/Data/PGSQL/PGSQLXInventoryData.cs @@ -205,7 +205,7 @@ namespace OpenSim.Data.PGSQL */ cmd.CommandText = String.Format(@"select bit_or(""inventoryCurrentPermissions"") as ""inventoryCurrentPermissions"" from inventoryitems - where ""avatarID"" = :PrincipalID + where ""avatarID""::uuid = :PrincipalID and ""assetID"" = :AssetID group by ""assetID"" "); From af1b00db419d21d629cd1d5cd0ec4e06060d310f Mon Sep 17 00:00:00 2001 From: Mandarinka Tasty Date: Sun, 1 Jan 2017 21:36:40 +0100 Subject: [PATCH 6/6] The robust command login reset should return config value: MinLoginLevel. Defaultly, it returns 0. Signed-off-by: Mandarinka Tasty Signed-off-by: Melanie Thielker --- OpenSim/Services/LLLoginService/LLLoginService.cs | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/OpenSim/Services/LLLoginService/LLLoginService.cs b/OpenSim/Services/LLLoginService/LLLoginService.cs index 80fc56fd8e..2941f51be1 100644 --- a/OpenSim/Services/LLLoginService/LLLoginService.cs +++ b/OpenSim/Services/LLLoginService/LLLoginService.cs @@ -1066,8 +1066,8 @@ namespace OpenSim.Services.LLLoginService } break; - case "reset": - m_MinLoginLevel = 0; + case "reset": + m_MinLoginLevel = m_LoginServerConfig.GetInt("MinLoginLevel", 0); MainConsole.Instance.OutputFormat("Reset min login level to {0}", m_MinLoginLevel); break;