aboutsummaryrefslogtreecommitdiffstatshomepage
diff options
context:
space:
mode:
Diffstat (limited to '')
-rw-r--r--OpenSim/Data/PGSQL/PGSQLXInventoryData.cs2
-rw-r--r--OpenSim/Region/CoreModules/World/Objects/Commands/ObjectCommandsModule.cs35
-rw-r--r--OpenSim/Server/Handlers/UserAccounts/UserAccountServerPostHandler.cs4
-rw-r--r--OpenSim/Services/HypergridService/UserAgentService.cs8
-rw-r--r--OpenSim/Services/LLLoginService/LLLoginService.cs6
5 files changed, 47 insertions, 8 deletions
diff --git a/OpenSim/Data/PGSQL/PGSQLXInventoryData.cs b/OpenSim/Data/PGSQL/PGSQLXInventoryData.cs
index c34a8dc..959c2cf 100644
--- a/OpenSim/Data/PGSQL/PGSQLXInventoryData.cs
+++ b/OpenSim/Data/PGSQL/PGSQLXInventoryData.cs
@@ -205,7 +205,7 @@ namespace OpenSim.Data.PGSQL
205*/ 205*/
206 cmd.CommandText = String.Format(@"select bit_or(""inventoryCurrentPermissions"") as ""inventoryCurrentPermissions"" 206 cmd.CommandText = String.Format(@"select bit_or(""inventoryCurrentPermissions"") as ""inventoryCurrentPermissions""
207 from inventoryitems 207 from inventoryitems
208 where ""avatarID"" = :PrincipalID 208 where ""avatarID""::uuid = :PrincipalID
209 and ""assetID"" = :AssetID 209 and ""assetID"" = :AssetID
210 group by ""assetID"" "); 210 group by ""assetID"" ");
211 211
diff --git a/OpenSim/Region/CoreModules/World/Objects/Commands/ObjectCommandsModule.cs b/OpenSim/Region/CoreModules/World/Objects/Commands/ObjectCommandsModule.cs
index 688648b..e53ab95 100644
--- a/OpenSim/Region/CoreModules/World/Objects/Commands/ObjectCommandsModule.cs
+++ b/OpenSim/Region/CoreModules/World/Objects/Commands/ObjectCommandsModule.cs
@@ -152,6 +152,15 @@ namespace OpenSim.Region.CoreModules.World.Objects.Commands
152 m_console.Commands.AddCommand( 152 m_console.Commands.AddCommand(
153 "Objects", 153 "Objects",
154 false, 154 false,
155 "show object owner",
156 "show object owner [--full] <OwnerID>",
157 "Show details of scene objects with given owner.",
158 "The --full option will print out information on all the parts of the object.\n",
159 HandleShowObjectByOwnerID);
160
161 m_console.Commands.AddCommand(
162 "Objects",
163 false,
155 "show object pos", 164 "show object pos",
156 "show object pos [--full] <start-coord> to <end-coord>", 165 "show object pos [--full] <start-coord> to <end-coord>",
157 "Show details of scene objects within the given area.", 166 "Show details of scene objects within the given area.",
@@ -325,6 +334,32 @@ namespace OpenSim.Region.CoreModules.World.Objects.Commands
325 OutputSogsToConsole(searchPredicate, showFull); 334 OutputSogsToConsole(searchPredicate, showFull);
326 } 335 }
327 336
337 private void HandleShowObjectByOwnerID(string module, string[] cmdparams)
338 {
339 if (!(m_console.ConsoleScene == null || m_console.ConsoleScene == m_scene))
340 return;
341
342 bool showFull = false;
343 OptionSet options = new OptionSet().Add("full", v => showFull = v != null);
344
345 List<string> mainParams = options.Parse(cmdparams);
346
347 if (mainParams.Count < 4)
348 {
349 m_console.OutputFormat("Usage: show object owner <OwnerID>");
350 return;
351 }
352
353 UUID ownerID;
354 if (!ConsoleUtil.TryParseConsoleUuid(m_console, mainParams[3], out ownerID))
355 return;
356
357 Predicate<SceneObjectGroup> searchPredicate
358 = so => so.OwnerID == ownerID && !so.IsAttachment;
359
360 OutputSogsToConsole(searchPredicate, showFull);
361 }
362
328 private void HandleShowObjectByPos(string module, string[] cmdparams) 363 private void HandleShowObjectByPos(string module, string[] cmdparams)
329 { 364 {
330 if (!(m_console.ConsoleScene == null || m_console.ConsoleScene == m_scene)) 365 if (!(m_console.ConsoleScene == null || m_console.ConsoleScene == m_scene))
diff --git a/OpenSim/Server/Handlers/UserAccounts/UserAccountServerPostHandler.cs b/OpenSim/Server/Handlers/UserAccounts/UserAccountServerPostHandler.cs
index b22c4cc..a02255f 100644
--- a/OpenSim/Server/Handlers/UserAccounts/UserAccountServerPostHandler.cs
+++ b/OpenSim/Server/Handlers/UserAccounts/UserAccountServerPostHandler.cs
@@ -98,7 +98,7 @@ namespace OpenSim.Server.Handlers.UserAccounts
98 if (m_AllowCreateUser) 98 if (m_AllowCreateUser)
99 return CreateUser(request); 99 return CreateUser(request);
100 else 100 else
101 break; 101 return FailureResult();
102 case "getaccount": 102 case "getaccount":
103 return GetAccount(request); 103 return GetAccount(request);
104 case "getaccounts": 104 case "getaccounts":
@@ -109,7 +109,7 @@ namespace OpenSim.Server.Handlers.UserAccounts
109 if (m_AllowSetAccount) 109 if (m_AllowSetAccount)
110 return StoreAccount(request); 110 return StoreAccount(request);
111 else 111 else
112 break; 112 return FailureResult();
113 } 113 }
114 114
115 m_log.DebugFormat("[USER SERVICE HANDLER]: unknown method request: {0}", method); 115 m_log.DebugFormat("[USER SERVICE HANDLER]: unknown method request: {0}", method);
diff --git a/OpenSim/Services/HypergridService/UserAgentService.cs b/OpenSim/Services/HypergridService/UserAgentService.cs
index 317d006..e701ec6 100644
--- a/OpenSim/Services/HypergridService/UserAgentService.cs
+++ b/OpenSim/Services/HypergridService/UserAgentService.cs
@@ -301,8 +301,12 @@ namespace OpenSim.Services.HypergridService
301 301
302 // Everything is ok 302 // Everything is ok
303 303
304 // Update the perceived IP Address of our grid 304 if (!fromLogin)
305 m_log.DebugFormat("[USER AGENT SERVICE]: Gatekeeper sees me as {0}", myExternalIP); 305 {
306 // Update the perceived IP Address of our grid
307 m_log.DebugFormat("[USER AGENT SERVICE]: Gatekeeper sees me as {0}", myExternalIP);
308 }
309
306 travel.MyIpAddress = myExternalIP; 310 travel.MyIpAddress = myExternalIP;
307 311
308 StoreTravelInfo(travel); 312 StoreTravelInfo(travel);
diff --git a/OpenSim/Services/LLLoginService/LLLoginService.cs b/OpenSim/Services/LLLoginService/LLLoginService.cs
index 5d69705..2941f51 100644
--- a/OpenSim/Services/LLLoginService/LLLoginService.cs
+++ b/OpenSim/Services/LLLoginService/LLLoginService.cs
@@ -82,7 +82,7 @@ namespace OpenSim.Services.LLLoginService
82 protected string m_SearchURL; 82 protected string m_SearchURL;
83 protected string m_Currency; 83 protected string m_Currency;
84 protected string m_ClassifiedFee; 84 protected string m_ClassifiedFee;
85 protected int m_MaxAgentGroups; 85 protected int m_MaxAgentGroups = 42;
86 protected string m_DestinationGuide; 86 protected string m_DestinationGuide;
87 protected string m_AvatarPicker; 87 protected string m_AvatarPicker;
88 protected string m_AllowedClients; 88 protected string m_AllowedClients;
@@ -1066,8 +1066,8 @@ namespace OpenSim.Services.LLLoginService
1066 } 1066 }
1067 break; 1067 break;
1068 1068
1069 case "reset": 1069 case "reset":
1070 m_MinLoginLevel = 0; 1070 m_MinLoginLevel = m_LoginServerConfig.GetInt("MinLoginLevel", 0);
1071 MainConsole.Instance.OutputFormat("Reset min login level to {0}", m_MinLoginLevel); 1071 MainConsole.Instance.OutputFormat("Reset min login level to {0}", m_MinLoginLevel);
1072 break; 1072 break;
1073 1073