aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Region/Application/OpenSim.cs
diff options
context:
space:
mode:
authorMelanie2013-10-04 20:03:12 +0100
committerMelanie2013-10-04 20:03:12 +0100
commit75c68fa29e3a2fed81c883e7925bf161e968639f (patch)
tree13ba69e6818f634018a5954d38750cf48128b7f8 /OpenSim/Region/Application/OpenSim.cs
parentMerge branch 'avination-current' into careminster (diff)
parentminor: Disable logging left active on regression test TestSameSimulatorIsolat... (diff)
downloadopensim-SC_OLD-75c68fa29e3a2fed81c883e7925bf161e968639f.zip
opensim-SC_OLD-75c68fa29e3a2fed81c883e7925bf161e968639f.tar.gz
opensim-SC_OLD-75c68fa29e3a2fed81c883e7925bf161e968639f.tar.bz2
opensim-SC_OLD-75c68fa29e3a2fed81c883e7925bf161e968639f.tar.xz
Merge branch 'master' into careminster
Conflicts: OpenSim/Data/MySQL/MySQLSimulationData.cs OpenSim/Data/MySQL/Resources/RegionStore.migrations OpenSim/Region/ClientStack/Linden/Caps/WebFetchInvDescModule.cs OpenSim/Region/CoreModules/Avatar/Attachments/AttachmentsModule.cs OpenSim/Region/CoreModules/Avatar/Inventory/Transfer/InventoryTransferModule.cs OpenSim/Region/CoreModules/World/LightShare/LightShareModule.cs OpenSim/Region/Framework/Scenes/Scene.cs OpenSim/Region/Framework/Scenes/ScenePresence.cs OpenSim/Region/Framework/Scenes/Tests/ScenePresenceCapabilityTests.cs OpenSim/Region/OptionalModules/World/NPC/NPCModule.cs OpenSim/Region/ScriptEngine/Shared/Api/Implementation/LSL_Api.cs
Diffstat (limited to 'OpenSim/Region/Application/OpenSim.cs')
-rw-r--r--OpenSim/Region/Application/OpenSim.cs56
1 files changed, 37 insertions, 19 deletions
diff --git a/OpenSim/Region/Application/OpenSim.cs b/OpenSim/Region/Application/OpenSim.cs
index a18a6fe..20f6af5 100644
--- a/OpenSim/Region/Application/OpenSim.cs
+++ b/OpenSim/Region/Application/OpenSim.cs
@@ -237,27 +237,33 @@ namespace OpenSim
237 237
238 m_console.Commands.AddCommand("General", false, "change region", 238 m_console.Commands.AddCommand("General", false, "change region",
239 "change region <region name>", 239 "change region <region name>",
240 "Change current console region", ChangeSelectedRegion); 240 "Change current console region",
241 ChangeSelectedRegion);
241 242
242 m_console.Commands.AddCommand("Archiving", false, "save xml", 243 m_console.Commands.AddCommand("Archiving", false, "save xml",
243 "save xml", 244 "save xml",
244 "Save a region's data in XML format", SaveXml); 245 "Save a region's data in XML format",
246 SaveXml);
245 247
246 m_console.Commands.AddCommand("Archiving", false, "save xml2", 248 m_console.Commands.AddCommand("Archiving", false, "save xml2",
247 "save xml2", 249 "save xml2",
248 "Save a region's data in XML2 format", SaveXml2); 250 "Save a region's data in XML2 format",
251 SaveXml2);
249 252
250 m_console.Commands.AddCommand("Archiving", false, "load xml", 253 m_console.Commands.AddCommand("Archiving", false, "load xml",
251 "load xml [-newIDs [<x> <y> <z>]]", 254 "load xml [-newIDs [<x> <y> <z>]]",
252 "Load a region's data from XML format", LoadXml); 255 "Load a region's data from XML format",
256 LoadXml);
253 257
254 m_console.Commands.AddCommand("Archiving", false, "load xml2", 258 m_console.Commands.AddCommand("Archiving", false, "load xml2",
255 "load xml2", 259 "load xml2",
256 "Load a region's data from XML2 format", LoadXml2); 260 "Load a region's data from XML2 format",
261 LoadXml2);
257 262
258 m_console.Commands.AddCommand("Archiving", false, "save prims xml2", 263 m_console.Commands.AddCommand("Archiving", false, "save prims xml2",
259 "save prims xml2 [<prim name> <file name>]", 264 "save prims xml2 [<prim name> <file name>]",
260 "Save named prim to XML2", SavePrimsXml2); 265 "Save named prim to XML2",
266 SavePrimsXml2);
261 267
262 m_console.Commands.AddCommand("Archiving", false, "load oar", 268 m_console.Commands.AddCommand("Archiving", false, "load oar",
263 "load oar [--merge] [--skip-assets] [<OAR path>]", 269 "load oar [--merge] [--skip-assets] [<OAR path>]",
@@ -287,7 +293,8 @@ namespace OpenSim
287 293
288 m_console.Commands.AddCommand("Objects", false, "edit scale", 294 m_console.Commands.AddCommand("Objects", false, "edit scale",
289 "edit scale <name> <x> <y> <z>", 295 "edit scale <name> <x> <y> <z>",
290 "Change the scale of a named prim", HandleEditScale); 296 "Change the scale of a named prim",
297 HandleEditScale);
291 298
292 m_console.Commands.AddCommand("Users", false, "kick user", 299 m_console.Commands.AddCommand("Users", false, "kick user",
293 "kick user <first> <last> [--force] [message]", 300 "kick user <first> <last> [--force] [message]",
@@ -305,31 +312,38 @@ namespace OpenSim
305 312
306 m_console.Commands.AddCommand("Comms", false, "show connections", 313 m_console.Commands.AddCommand("Comms", false, "show connections",
307 "show connections", 314 "show connections",
308 "Show connection data", HandleShow); 315 "Show connection data",
316 HandleShow);
309 317
310 m_console.Commands.AddCommand("Comms", false, "show circuits", 318 m_console.Commands.AddCommand("Comms", false, "show circuits",
311 "show circuits", 319 "show circuits",
312 "Show agent circuit data", HandleShow); 320 "Show agent circuit data",
321 HandleShow);
313 322
314 m_console.Commands.AddCommand("Comms", false, "show pending-objects", 323 m_console.Commands.AddCommand("Comms", false, "show pending-objects",
315 "show pending-objects", 324 "show pending-objects",
316 "Show # of objects on the pending queues of all scene viewers", HandleShow); 325 "Show # of objects on the pending queues of all scene viewers",
326 HandleShow);
317 327
318 m_console.Commands.AddCommand("General", false, "show modules", 328 m_console.Commands.AddCommand("General", false, "show modules",
319 "show modules", 329 "show modules",
320 "Show module data", HandleShow); 330 "Show module data",
331 HandleShow);
321 332
322 m_console.Commands.AddCommand("Regions", false, "show regions", 333 m_console.Commands.AddCommand("Regions", false, "show regions",
323 "show regions", 334 "show regions",
324 "Show region data", HandleShow); 335 "Show region data",
336 HandleShow);
325 337
326 m_console.Commands.AddCommand("Regions", false, "show ratings", 338 m_console.Commands.AddCommand("Regions", false, "show ratings",
327 "show ratings", 339 "show ratings",
328 "Show rating data", HandleShow); 340 "Show rating data",
341 HandleShow);
329 342
330 m_console.Commands.AddCommand("Objects", false, "backup", 343 m_console.Commands.AddCommand("Objects", false, "backup",
331 "backup", 344 "backup",
332 "Persist currently unsaved object changes immediately instead of waiting for the normal persistence call.", RunCommand); 345 "Persist currently unsaved object changes immediately instead of waiting for the normal persistence call.",
346 RunCommand);
333 347
334 m_console.Commands.AddCommand("Regions", false, "create region", 348 m_console.Commands.AddCommand("Regions", false, "create region",
335 "create region [\"region name\"] <region_file.ini>", 349 "create region [\"region name\"] <region_file.ini>",
@@ -342,19 +356,23 @@ namespace OpenSim
342 356
343 m_console.Commands.AddCommand("Regions", false, "restart", 357 m_console.Commands.AddCommand("Regions", false, "restart",
344 "restart", 358 "restart",
345 "Restart all sims in this instance", RunCommand); 359 "Restart all sims in this instance",
360 RunCommand);
346 361
347 m_console.Commands.AddCommand("General", false, "command-script", 362 m_console.Commands.AddCommand("General", false, "command-script",
348 "command-script <script>", 363 "command-script <script>",
349 "Run a command script from file", RunCommand); 364 "Run a command script from file",
365 RunCommand);
350 366
351 m_console.Commands.AddCommand("Regions", false, "remove-region", 367 m_console.Commands.AddCommand("Regions", false, "remove-region",
352 "remove-region <name>", 368 "remove-region <name>",
353 "Remove a region from this simulator", RunCommand); 369 "Remove a region from this simulator",
370 RunCommand);
354 371
355 m_console.Commands.AddCommand("Regions", false, "delete-region", 372 m_console.Commands.AddCommand("Regions", false, "delete-region",
356 "delete-region <name>", 373 "delete-region <name>",
357 "Delete a region from disk", RunCommand); 374 "Delete a region from disk",
375 RunCommand);
358 } 376 }
359 377
360 protected override void ShutdownSpecific() 378 protected override void ShutdownSpecific()
@@ -434,7 +452,7 @@ namespace OpenSim
434 else 452 else
435 presence.ControllingClient.Kick("\nYou have been logged out by an administrator.\n"); 453 presence.ControllingClient.Kick("\nYou have been logged out by an administrator.\n");
436 454
437 presence.Scene.IncomingCloseAgent(presence.UUID, force); 455 presence.Scene.CloseAgent(presence.UUID, force);
438 break; 456 break;
439 } 457 }
440 } 458 }