diff options
-rw-r--r-- | OpenSim/Region/Application/OpenSim.cs | 8 | ||||
-rw-r--r-- | OpenSim/Region/CoreModules/World/Objects/Commands/ObjectCommandsModule.cs | 22 |
2 files changed, 17 insertions, 13 deletions
diff --git a/OpenSim/Region/Application/OpenSim.cs b/OpenSim/Region/Application/OpenSim.cs index 59b6b21..4ec64ee 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 8da9139..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>", |