Merge branch 'master' into httptests

httptests
UbitUmarov 2017-01-04 23:16:47 +00:00
commit 5da7752ebc
5 changed files with 47 additions and 8 deletions

View File

@ -205,7 +205,7 @@ namespace OpenSim.Data.PGSQL
*/ */
cmd.CommandText = String.Format(@"select bit_or(""inventoryCurrentPermissions"") as ""inventoryCurrentPermissions"" cmd.CommandText = String.Format(@"select bit_or(""inventoryCurrentPermissions"") as ""inventoryCurrentPermissions""
from inventoryitems from inventoryitems
where ""avatarID"" = :PrincipalID where ""avatarID""::uuid = :PrincipalID
and ""assetID"" = :AssetID and ""assetID"" = :AssetID
group by ""assetID"" "); group by ""assetID"" ");

View File

@ -149,6 +149,15 @@ namespace OpenSim.Region.CoreModules.World.Objects.Commands
+ "If --regex is specified then the name is treatead as a regular expression.", + "If --regex is specified then the name is treatead as a regular expression.",
HandleShowObjectByName); HandleShowObjectByName);
m_console.Commands.AddCommand(
"Objects",
false,
"show object owner",
"show object owner [--full] <OwnerID>",
"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( m_console.Commands.AddCommand(
"Objects", "Objects",
false, false,
@ -325,6 +334,32 @@ namespace OpenSim.Region.CoreModules.World.Objects.Commands
OutputSogsToConsole(searchPredicate, showFull); 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<string> mainParams = options.Parse(cmdparams);
if (mainParams.Count < 4)
{
m_console.OutputFormat("Usage: show object owner <OwnerID>");
return;
}
UUID ownerID;
if (!ConsoleUtil.TryParseConsoleUuid(m_console, mainParams[3], out ownerID))
return;
Predicate<SceneObjectGroup> searchPredicate
= so => so.OwnerID == ownerID && !so.IsAttachment;
OutputSogsToConsole(searchPredicate, showFull);
}
private void HandleShowObjectByPos(string module, string[] cmdparams) private void HandleShowObjectByPos(string module, string[] cmdparams)
{ {
if (!(m_console.ConsoleScene == null || m_console.ConsoleScene == m_scene)) if (!(m_console.ConsoleScene == null || m_console.ConsoleScene == m_scene))

View File

@ -98,7 +98,7 @@ namespace OpenSim.Server.Handlers.UserAccounts
if (m_AllowCreateUser) if (m_AllowCreateUser)
return CreateUser(request); return CreateUser(request);
else else
break; return FailureResult();
case "getaccount": case "getaccount":
return GetAccount(request); return GetAccount(request);
case "getaccounts": case "getaccounts":
@ -109,7 +109,7 @@ namespace OpenSim.Server.Handlers.UserAccounts
if (m_AllowSetAccount) if (m_AllowSetAccount)
return StoreAccount(request); return StoreAccount(request);
else else
break; return FailureResult();
} }
m_log.DebugFormat("[USER SERVICE HANDLER]: unknown method request: {0}", method); m_log.DebugFormat("[USER SERVICE HANDLER]: unknown method request: {0}", method);

View File

@ -301,8 +301,12 @@ namespace OpenSim.Services.HypergridService
// Everything is ok // Everything is ok
// Update the perceived IP Address of our grid if (!fromLogin)
m_log.DebugFormat("[USER AGENT SERVICE]: Gatekeeper sees me as {0}", myExternalIP); {
// Update the perceived IP Address of our grid
m_log.DebugFormat("[USER AGENT SERVICE]: Gatekeeper sees me as {0}", myExternalIP);
}
travel.MyIpAddress = myExternalIP; travel.MyIpAddress = myExternalIP;
StoreTravelInfo(travel); StoreTravelInfo(travel);

View File

@ -82,7 +82,7 @@ namespace OpenSim.Services.LLLoginService
protected string m_SearchURL; protected string m_SearchURL;
protected string m_Currency; protected string m_Currency;
protected string m_ClassifiedFee; protected string m_ClassifiedFee;
protected int m_MaxAgentGroups; protected int m_MaxAgentGroups = 42;
protected string m_DestinationGuide; protected string m_DestinationGuide;
protected string m_AvatarPicker; protected string m_AvatarPicker;
protected string m_AllowedClients; protected string m_AllowedClients;
@ -1067,7 +1067,7 @@ namespace OpenSim.Services.LLLoginService
break; break;
case "reset": case "reset":
m_MinLoginLevel = 0; m_MinLoginLevel = m_LoginServerConfig.GetInt("MinLoginLevel", 0);
MainConsole.Instance.OutputFormat("Reset min login level to {0}", m_MinLoginLevel); MainConsole.Instance.OutputFormat("Reset min login level to {0}", m_MinLoginLevel);
break; break;