diff options
author | Melanie | 2012-04-29 02:23:54 +0100 |
---|---|---|
committer | Melanie | 2012-04-29 02:23:54 +0100 |
commit | ad12b5df49b5bc214a3758e2399858d8c98ce24e (patch) | |
tree | 9a630ee336bab317a07ec988213aaa17fed13c9b | |
parent | Merge branch 'avination' (diff) | |
parent | Comment out debug [ASYNC DELETER] messages for now. (diff) | |
download | opensim-SC_OLD-ad12b5df49b5bc214a3758e2399858d8c98ce24e.zip opensim-SC_OLD-ad12b5df49b5bc214a3758e2399858d8c98ce24e.tar.gz opensim-SC_OLD-ad12b5df49b5bc214a3758e2399858d8c98ce24e.tar.bz2 opensim-SC_OLD-ad12b5df49b5bc214a3758e2399858d8c98ce24e.tar.xz |
Merge branch 'master' into careminster
5 files changed, 34 insertions, 22 deletions
diff --git a/OpenSim/Framework/Console/CommandConsole.cs b/OpenSim/Framework/Console/CommandConsole.cs index c5d6b78..87bdacd 100644 --- a/OpenSim/Framework/Console/CommandConsole.cs +++ b/OpenSim/Framework/Console/CommandConsole.cs | |||
@@ -79,7 +79,11 @@ namespace OpenSim.Framework.Console | |||
79 | public List<CommandDelegate> fn; | 79 | public List<CommandDelegate> fn; |
80 | } | 80 | } |
81 | 81 | ||
82 | public const string GeneralHelpText = "For more information, type 'help <item>' where <item> is one of the following categories:"; | 82 | public const string GeneralHelpText |
83 | = "To enter an argument that contains spaces, surround the argument with double quotes.\nFor example, show object name \"My long object name\"\n"; | ||
84 | |||
85 | public const string ItemHelpText | ||
86 | = "For more information, type 'help <item>' where <item> is one of the following:"; | ||
83 | 87 | ||
84 | /// <value> | 88 | /// <value> |
85 | /// Commands organized by keyword in a tree | 89 | /// Commands organized by keyword in a tree |
@@ -108,7 +112,9 @@ namespace OpenSim.Framework.Console | |||
108 | // General help | 112 | // General help |
109 | if (helpParts.Count == 0) | 113 | if (helpParts.Count == 0) |
110 | { | 114 | { |
115 | help.Add(""); // Will become a newline. | ||
111 | help.Add(GeneralHelpText); | 116 | help.Add(GeneralHelpText); |
117 | help.Add(ItemHelpText); | ||
112 | help.AddRange(CollectModulesHelp(tree)); | 118 | help.AddRange(CollectModulesHelp(tree)); |
113 | } | 119 | } |
114 | else | 120 | else |
@@ -132,7 +138,7 @@ namespace OpenSim.Framework.Console | |||
132 | // Check modules first to see if we just need to display a list of those commands | 138 | // Check modules first to see if we just need to display a list of those commands |
133 | if (TryCollectModuleHelp(originalHelpRequest, help)) | 139 | if (TryCollectModuleHelp(originalHelpRequest, help)) |
134 | { | 140 | { |
135 | help.Insert(0, GeneralHelpText); | 141 | help.Insert(0, ItemHelpText); |
136 | return help; | 142 | return help; |
137 | } | 143 | } |
138 | 144 | ||
diff --git a/OpenSim/Region/Application/OpenSim.cs b/OpenSim/Region/Application/OpenSim.cs index fb1e831..e4bd857 100644 --- a/OpenSim/Region/Application/OpenSim.cs +++ b/OpenSim/Region/Application/OpenSim.cs | |||
@@ -225,7 +225,7 @@ namespace OpenSim | |||
225 | /// </summary> | 225 | /// </summary> |
226 | private void RegisterConsoleCommands() | 226 | private void RegisterConsoleCommands() |
227 | { | 227 | { |
228 | m_console.Commands.AddCommand("Regions", false, "force update", | 228 | m_console.Commands.AddCommand("Objects", false, "force update", |
229 | "force update", | 229 | "force update", |
230 | "Force the update of all objects on clients", | 230 | "Force the update of all objects on clients", |
231 | HandleForceUpdate); | 231 | HandleForceUpdate); |
@@ -306,7 +306,7 @@ namespace OpenSim | |||
306 | + " If this is not given then the oar is saved to region.oar in the current directory.", | 306 | + " If this is not given then the oar is saved to region.oar in the current directory.", |
307 | SaveOar); | 307 | SaveOar); |
308 | 308 | ||
309 | m_console.Commands.AddCommand("Regions", false, "edit scale", | 309 | m_console.Commands.AddCommand("Objects", false, "edit scale", |
310 | "edit scale <name> <x> <y> <z>", | 310 | "edit scale <name> <x> <y> <z>", |
311 | "Change the scale of a named prim", HandleEditScale); | 311 | "Change the scale of a named prim", HandleEditScale); |
312 | 312 | ||
@@ -349,7 +349,7 @@ namespace OpenSim | |||
349 | "show ratings", | 349 | "show ratings", |
350 | "Show rating data", HandleShow); | 350 | "Show rating data", HandleShow); |
351 | 351 | ||
352 | m_console.Commands.AddCommand("Regions", false, "backup", | 352 | m_console.Commands.AddCommand("Objects", false, "backup", |
353 | "backup", | 353 | "backup", |
354 | "Persist currently unsaved object changes immediately instead of waiting for the normal persistence call.", RunCommand); | 354 | "Persist currently unsaved object changes immediately instead of waiting for the normal persistence call.", RunCommand); |
355 | 355 | ||
@@ -410,7 +410,7 @@ namespace OpenSim | |||
410 | "modules unload <name>", | 410 | "modules unload <name>", |
411 | "Unload a module", HandleModules); | 411 | "Unload a module", HandleModules); |
412 | 412 | ||
413 | m_console.Commands.AddCommand("Regions", false, "kill uuid", | 413 | m_console.Commands.AddCommand("Objects", false, "kill uuid", |
414 | "kill uuid <UUID>", | 414 | "kill uuid <UUID>", |
415 | "Kill an object by UUID", KillUUID); | 415 | "Kill an object by UUID", KillUUID); |
416 | } | 416 | } |
diff --git a/OpenSim/Region/CoreModules/World/Objects/Commands/ObjectCommandsModule.cs b/OpenSim/Region/CoreModules/World/Objects/Commands/ObjectCommandsModule.cs index 06fea58..5e928f3 100644 --- a/OpenSim/Region/CoreModules/World/Objects/Commands/ObjectCommandsModule.cs +++ b/OpenSim/Region/CoreModules/World/Objects/Commands/ObjectCommandsModule.cs | |||
@@ -78,45 +78,49 @@ namespace OpenSim.Region.CoreModules.World.Objects.Commands | |||
78 | m_scene = scene; | 78 | m_scene = scene; |
79 | m_console = MainConsole.Instance; | 79 | m_console = MainConsole.Instance; |
80 | 80 | ||
81 | m_console.Commands.AddCommand("Regions", false, "delete object owner", | 81 | m_console.Commands.AddCommand("Objects", false, "delete object owner", |
82 | "delete object owner <UUID>", | 82 | "delete object owner <UUID>", |
83 | "Delete a scene object by owner", HandleDeleteObject); | 83 | "Delete a scene object by owner", HandleDeleteObject); |
84 | m_console.Commands.AddCommand("Regions", false, "delete object creator", | 84 | |
85 | m_console.Commands.AddCommand("Objects", false, "delete object creator", | ||
85 | "delete object creator <UUID>", | 86 | "delete object creator <UUID>", |
86 | "Delete a scene object by creator", HandleDeleteObject); | 87 | "Delete a scene object by creator", HandleDeleteObject); |
87 | m_console.Commands.AddCommand("Regions", false, "delete object uuid", | 88 | |
89 | m_console.Commands.AddCommand("Objects", false, "delete object uuid", | ||
88 | "delete object uuid <UUID>", | 90 | "delete object uuid <UUID>", |
89 | "Delete a scene object by uuid", HandleDeleteObject); | 91 | "Delete a scene object by uuid", HandleDeleteObject); |
90 | m_console.Commands.AddCommand("Regions", false, "delete object name", | 92 | |
93 | m_console.Commands.AddCommand("Objects", false, "delete object name", | ||
91 | "delete object name <name>", | 94 | "delete object name <name>", |
92 | "Delete a scene object by name", HandleDeleteObject); | 95 | "Delete a scene object by name", HandleDeleteObject); |
93 | m_console.Commands.AddCommand("Regions", false, "delete object outside", | 96 | |
97 | m_console.Commands.AddCommand("Objects", false, "delete object outside", | ||
94 | "delete object outside", | 98 | "delete object outside", |
95 | "Delete all scene objects outside region boundaries", HandleDeleteObject); | 99 | "Delete all scene objects outside region boundaries", HandleDeleteObject); |
96 | 100 | ||
97 | m_console.Commands.AddCommand( | 101 | m_console.Commands.AddCommand( |
98 | "Regions", | 102 | "Objects", |
99 | false, | 103 | false, |
100 | "show object uuid", | 104 | "show object uuid", |
101 | "show object uuid <UUID>", | 105 | "show object uuid <UUID>", |
102 | "Show details of a scene object with the given UUID", HandleShowObjectByUuid); | 106 | "Show details of a scene object with the given UUID", HandleShowObjectByUuid); |
103 | 107 | ||
104 | m_console.Commands.AddCommand( | 108 | m_console.Commands.AddCommand( |
105 | "Regions", | 109 | "Objects", |
106 | false, | 110 | false, |
107 | "show object name", | 111 | "show object name", |
108 | "show object name <name>", | 112 | "show object name <name>", |
109 | "Show details of scene objects with the given name", HandleShowObjectByName); | 113 | "Show details of scene objects with the given name", HandleShowObjectByName); |
110 | 114 | ||
111 | m_console.Commands.AddCommand( | 115 | m_console.Commands.AddCommand( |
112 | "Regions", | 116 | "Objects", |
113 | false, | 117 | false, |
114 | "show part uuid", | 118 | "show part uuid", |
115 | "show part uuid <UUID>", | 119 | "show part uuid <UUID>", |
116 | "Show details of a scene object parts with the given UUID", HandleShowPartByUuid); | 120 | "Show details of a scene object parts with the given UUID", HandleShowPartByUuid); |
117 | 121 | ||
118 | m_console.Commands.AddCommand( | 122 | m_console.Commands.AddCommand( |
119 | "Regions", | 123 | "Objects", |
120 | false, | 124 | false, |
121 | "show part name", | 125 | "show part name", |
122 | "show part name <name>", | 126 | "show part name <name>", |
@@ -271,6 +275,7 @@ namespace OpenSim.Region.CoreModules.World.Objects.Commands | |||
271 | sb.AppendFormat("Description: {0}\n", so.Description); | 275 | sb.AppendFormat("Description: {0}\n", so.Description); |
272 | sb.AppendFormat("Location: {0} @ {1}\n", so.AbsolutePosition, so.Scene.RegionInfo.RegionName); | 276 | sb.AppendFormat("Location: {0} @ {1}\n", so.AbsolutePosition, so.Scene.RegionInfo.RegionName); |
273 | sb.AppendFormat("Parts: {0}\n", so.PrimCount); | 277 | sb.AppendFormat("Parts: {0}\n", so.PrimCount); |
278 | sb.AppendFormat("Flags: {0}\n", so.RootPart.Flags); | ||
274 | 279 | ||
275 | return sb; | 280 | return sb; |
276 | } | 281 | } |
@@ -283,6 +288,7 @@ namespace OpenSim.Region.CoreModules.World.Objects.Commands | |||
283 | sb.AppendFormat("Parent: {0}", | 288 | sb.AppendFormat("Parent: {0}", |
284 | sop.IsRoot ? "Is Root\n" : string.Format("{0} {1}\n", sop.ParentGroup.Name, sop.ParentGroup.UUID)); | 289 | sop.IsRoot ? "Is Root\n" : string.Format("{0} {1}\n", sop.ParentGroup.Name, sop.ParentGroup.UUID)); |
285 | sb.AppendFormat("Link number: {0}\n", sop.LinkNum); | 290 | sb.AppendFormat("Link number: {0}\n", sop.LinkNum); |
291 | sb.AppendFormat("Flags: {0}\n", sop.Flags); | ||
286 | 292 | ||
287 | return sb; | 293 | return sb; |
288 | } | 294 | } |
diff --git a/OpenSim/Region/Framework/Scenes/AsyncSceneObjectGroupDeleter.cs b/OpenSim/Region/Framework/Scenes/AsyncSceneObjectGroupDeleter.cs index f678d07..834464b 100644 --- a/OpenSim/Region/Framework/Scenes/AsyncSceneObjectGroupDeleter.cs +++ b/OpenSim/Region/Framework/Scenes/AsyncSceneObjectGroupDeleter.cs | |||
@@ -117,7 +117,7 @@ namespace OpenSim.Region.Framework.Scenes | |||
117 | 117 | ||
118 | private void InventoryRunDeleteTimer(object sender, ElapsedEventArgs e) | 118 | private void InventoryRunDeleteTimer(object sender, ElapsedEventArgs e) |
119 | { | 119 | { |
120 | m_log.Debug("[ASYNC DELETER]: Starting send to inventory loop"); | 120 | // m_log.Debug("[ASYNC DELETER]: Starting send to inventory loop"); |
121 | 121 | ||
122 | // We must set appearance parameters in the en_US culture in order to avoid issues where values are saved | 122 | // We must set appearance parameters in the en_US culture in order to avoid issues where values are saved |
123 | // in a culture where decimal points are commas and then reloaded in a culture which just treats them as | 123 | // in a culture where decimal points are commas and then reloaded in a culture which just treats them as |
@@ -147,9 +147,9 @@ namespace OpenSim.Region.Framework.Scenes | |||
147 | { | 147 | { |
148 | x = m_inventoryDeletes.Dequeue(); | 148 | x = m_inventoryDeletes.Dequeue(); |
149 | 149 | ||
150 | m_log.DebugFormat( | 150 | // m_log.DebugFormat( |
151 | "[ASYNC DELETER]: Sending object to user's inventory, action {1}, count {2}, {0} item(s) remaining.", | 151 | // "[ASYNC DELETER]: Sending object to user's inventory, action {1}, count {2}, {0} item(s) remaining.", |
152 | left, x.action, x.objectGroups.Count); | 152 | // left, x.action, x.objectGroups.Count); |
153 | 153 | ||
154 | try | 154 | try |
155 | { | 155 | { |
@@ -185,7 +185,7 @@ namespace OpenSim.Region.Framework.Scenes | |||
185 | e.StackTrace); | 185 | e.StackTrace); |
186 | } | 186 | } |
187 | 187 | ||
188 | m_log.Debug("[ASYNC DELETER]: No objects left in inventory send queue."); | 188 | // m_log.Debug("[ASYNC DELETER]: No objects left in inventory send queue."); |
189 | 189 | ||
190 | return false; | 190 | return false; |
191 | } | 191 | } |
diff --git a/OpenSim/Region/OptionalModules/Avatar/XmlRpcGroups/SimianGroupsServicesConnectorModule.cs b/OpenSim/Region/OptionalModules/Avatar/XmlRpcGroups/SimianGroupsServicesConnectorModule.cs index 130513d..5d57f70 100644 --- a/OpenSim/Region/OptionalModules/Avatar/XmlRpcGroups/SimianGroupsServicesConnectorModule.cs +++ b/OpenSim/Region/OptionalModules/Avatar/XmlRpcGroups/SimianGroupsServicesConnectorModule.cs | |||
@@ -1401,9 +1401,9 @@ namespace OpenSim.Region.OptionalModules.Avatar.XmlRpcGroups | |||
1401 | { | 1401 | { |
1402 | response = WebUtil.PostToService(m_groupsServerURI, requestArgs); | 1402 | response = WebUtil.PostToService(m_groupsServerURI, requestArgs); |
1403 | } | 1403 | } |
1404 | catch (Exception e) | 1404 | catch (Exception) |
1405 | { | 1405 | { |
1406 | m_log.InfoFormat("[SIMIAN GROUPS CONNECTOR] request failed {0}",CacheKey); | 1406 | m_log.ErrorFormat("[SIMIAN GROUPS CONNECTOR]: request failed {0}", CacheKey); |
1407 | } | 1407 | } |
1408 | 1408 | ||
1409 | // and cache the response | 1409 | // and cache the response |