OpenSim
/
OpenSimMirror
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Put scene object related console commands into new "Objects" help category rather than "Regions"

0.7.4.1
Justin Clark-Casey (justincc) 2012-04-28 00:08:04 +01:00
parent ab71779221
commit 2bad430ed8
2 changed files with 17 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
OpenSim/Region/Application/OpenSim.cs
View File

@ -225,7 +225,7 @@ namespace OpenSim
/// </summary> /// </summary>
private void RegisterConsoleCommands() private void RegisterConsoleCommands()
{ {
m_console.Commands.AddCommand("Regions", false, "force update", m_console.Commands.AddCommand("Objects", false, "force update",
"force update", "force update",
"Force the update of all objects on clients", "Force the update of all objects on clients",
HandleForceUpdate); HandleForceUpdate);
@ -306,7 +306,7 @@ namespace OpenSim
+ " If this is not given then the oar is saved to region.oar in the current directory.", + " If this is not given then the oar is saved to region.oar in the current directory.",
SaveOar); SaveOar);
m_console.Commands.AddCommand("Regions", false, "edit scale", m_console.Commands.AddCommand("Objects", false, "edit scale",
"edit scale <name> <x> <y> <z>", "edit scale <name> <x> <y> <z>",
"Change the scale of a named prim", HandleEditScale); "Change the scale of a named prim", HandleEditScale);
@ -349,7 +349,7 @@ namespace OpenSim
"show ratings", "show ratings",
"Show rating data", HandleShow); "Show rating data", HandleShow);
m_console.Commands.AddCommand("Regions", false, "backup", m_console.Commands.AddCommand("Objects", false, "backup",
"backup", "backup",
"Persist currently unsaved object changes immediately instead of waiting for the normal persistence call.", RunCommand); "Persist currently unsaved object changes immediately instead of waiting for the normal persistence call.", RunCommand);
@ -410,7 +410,7 @@ namespace OpenSim
"modules unload <name>", "modules unload <name>",
"Unload a module", HandleModules); "Unload a module", HandleModules);
m_console.Commands.AddCommand("Regions", false, "kill uuid", m_console.Commands.AddCommand("Objects", false, "kill uuid",
"kill uuid <UUID>", "kill uuid <UUID>",
"Kill an object by UUID", KillUUID); "Kill an object by UUID", KillUUID);
} }

22
OpenSim/Region/CoreModules/World/Objects/Commands/ObjectCommandsModule.cs
View File

@ -78,45 +78,49 @@ namespace OpenSim.Region.CoreModules.World.Objects.Commands
m_scene = scene; m_scene = scene;
m_console = MainConsole.Instance; m_console = MainConsole.Instance;
m_console.Commands.AddCommand("Regions", false, "delete object owner", m_console.Commands.AddCommand("Objects", false, "delete object owner",
"delete object owner <UUID>", "delete object owner <UUID>",
"Delete a scene object by owner", HandleDeleteObject); "Delete a scene object by owner", HandleDeleteObject);
m_console.Commands.AddCommand("Regions", false, "delete object creator",
m_console.Commands.AddCommand("Objects", false, "delete object creator",
"delete object creator <UUID>", "delete object creator <UUID>",
"Delete a scene object by creator", HandleDeleteObject); "Delete a scene object by creator", HandleDeleteObject);
m_console.Commands.AddCommand("Regions", false, "delete object uuid",
m_console.Commands.AddCommand("Objects", false, "delete object uuid",
"delete object uuid <UUID>", "delete object uuid <UUID>",
"Delete a scene object by uuid", HandleDeleteObject); "Delete a scene object by uuid", HandleDeleteObject);
m_console.Commands.AddCommand("Regions", false, "delete object name",
m_console.Commands.AddCommand("Objects", false, "delete object name",
"delete object name <name>", "delete object name <name>",
"Delete a scene object by name", HandleDeleteObject); "Delete a scene object by name", HandleDeleteObject);
m_console.Commands.AddCommand("Regions", false, "delete object outside",
m_console.Commands.AddCommand("Objects", false, "delete object outside",
"delete object outside", "delete object outside",
"Delete all scene objects outside region boundaries", HandleDeleteObject); "Delete all scene objects outside region boundaries", HandleDeleteObject);
m_console.Commands.AddCommand( m_console.Commands.AddCommand(
"Regions", "Objects",
false, false,
"show object uuid", "show object uuid",
"show object uuid <UUID>", "show object uuid <UUID>",
"Show details of a scene object with the given UUID", HandleShowObjectByUuid); "Show details of a scene object with the given UUID", HandleShowObjectByUuid);
m_console.Commands.AddCommand( m_console.Commands.AddCommand(
"Regions", "Objects",
false, false,
"show object name", "show object name",
"show object name <name>", "show object name <name>",
"Show details of scene objects with the given name", HandleShowObjectByName); "Show details of scene objects with the given name", HandleShowObjectByName);
m_console.Commands.AddCommand( m_console.Commands.AddCommand(
"Regions", "Objects",
false, false,
"show part uuid", "show part uuid",
"show part uuid <UUID>", "show part uuid <UUID>",
"Show details of a scene object parts with the given UUID", HandleShowPartByUuid); "Show details of a scene object parts with the given UUID", HandleShowPartByUuid);
m_console.Commands.AddCommand( m_console.Commands.AddCommand(
"Regions", "Objects",
false, false,
"show part name", "show part name",
"show part name <name>", "show part name <name>",