aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Region/Application/OpenSim.cs
diff options
context:
space:
mode:
authorMelanie2012-04-29 02:23:54 +0100
committerMelanie2012-04-29 02:23:54 +0100
commitad12b5df49b5bc214a3758e2399858d8c98ce24e (patch)
tree9a630ee336bab317a07ec988213aaa17fed13c9b /OpenSim/Region/Application/OpenSim.cs
parentMerge branch 'avination' (diff)
parentComment out debug [ASYNC DELETER] messages for now. (diff)
downloadopensim-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
Diffstat (limited to 'OpenSim/Region/Application/OpenSim.cs')
-rw-r--r--OpenSim/Region/Application/OpenSim.cs8
1 files changed, 4 insertions, 4 deletions
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 }