aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Region/Application/OpenSimMain.cs
diff options
context:
space:
mode:
authorlbsa712007-09-20 05:02:44 +0000
committerlbsa712007-09-20 05:02:44 +0000
commit4ce0c0794afae5f068a0a5c1d6b54fd4487334d7 (patch)
treee0534f4ba389e1d45e8d1552a89bf251667b82f8 /OpenSim/Region/Application/OpenSimMain.cs
parent* A feeble attempt at adding Grid db support to SQLite, just adding some code... (diff)
downloadopensim-SC_OLD-4ce0c0794afae5f068a0a5c1d6b54fd4487334d7.zip
opensim-SC_OLD-4ce0c0794afae5f068a0a5c1d6b54fd4487334d7.tar.gz
opensim-SC_OLD-4ce0c0794afae5f068a0a5c1d6b54fd4487334d7.tar.bz2
opensim-SC_OLD-4ce0c0794afae5f068a0a5c1d6b54fd4487334d7.tar.xz
* Added TryGetAvatar to SceneManager
* Refactored some names for clarity
Diffstat (limited to 'OpenSim/Region/Application/OpenSimMain.cs')
-rw-r--r--OpenSim/Region/Application/OpenSimMain.cs30
1 files changed, 15 insertions, 15 deletions
diff --git a/OpenSim/Region/Application/OpenSimMain.cs b/OpenSim/Region/Application/OpenSimMain.cs
index 1401f6e..a32b625 100644
--- a/OpenSim/Region/Application/OpenSimMain.cs
+++ b/OpenSim/Region/Application/OpenSimMain.cs
@@ -377,19 +377,19 @@ namespace OpenSim
377 switch (command) 377 switch (command)
378 { 378 {
379 case "set-time": 379 case "set-time":
380 m_localScenes.SetTimePhase(Convert.ToInt32(cmdparams[0])); 380 m_localScenes.SetCurrentSceneTimePhase(Convert.ToInt32(cmdparams[0]));
381 break; 381 break;
382 382
383 case "force-update": 383 case "force-update":
384 Console.WriteLine("Updating all clients"); 384 Console.WriteLine("Updating all clients");
385 m_localScenes.ForceClientUpdate(); 385 m_localScenes.ForceCurrentSceneClientUpdate();
386 break; 386 break;
387 387
388 388
389 case "edit-scale": 389 case "edit-scale":
390 if (cmdparams.Length == 4) 390 if (cmdparams.Length == 4)
391 { 391 {
392 m_localScenes.HandleEditCommand(cmdparams); 392 m_localScenes.HandleEditCommandOnCurrentScene(cmdparams);
393 } 393 }
394 break; 394 break;
395 395
@@ -427,34 +427,34 @@ namespace OpenSim
427 case "save-xml": 427 case "save-xml":
428 if (cmdparams.Length > 0) 428 if (cmdparams.Length > 0)
429 { 429 {
430 m_localScenes.SavePrimsToXml(cmdparams[0]); 430 m_localScenes.SaveCurrentSceneToXml(cmdparams[0]);
431 } 431 }
432 else 432 else
433 { 433 {
434 m_localScenes.SavePrimsToXml(DEFAULT_PRIM_BACKUP_FILENAME); 434 m_localScenes.SaveCurrentSceneToXml(DEFAULT_PRIM_BACKUP_FILENAME);
435 } 435 }
436 break; 436 break;
437 437
438 case "load-xml": 438 case "load-xml":
439 if (cmdparams.Length > 0) 439 if (cmdparams.Length > 0)
440 { 440 {
441 m_localScenes.LoadPrimsFromXml(cmdparams[0]); 441 m_localScenes.LoadCurrentSceneFromXml(cmdparams[0]);
442 } 442 }
443 else 443 else
444 { 444 {
445 m_localScenes.LoadPrimsFromXml(DEFAULT_PRIM_BACKUP_FILENAME); 445 m_localScenes.LoadCurrentSceneFromXml(DEFAULT_PRIM_BACKUP_FILENAME);
446 } 446 }
447 break; 447 break;
448 448
449 case "terrain": 449 case "terrain":
450 if (!m_localScenes.RunTerrainCmd(cmdparams, ref result)) 450 if (!m_localScenes.RunTerrainCmdOnCurrentScene(cmdparams, ref result))
451 { 451 {
452 m_log.Error(result); 452 m_log.Error(result);
453 } 453 }
454 break; 454 break;
455 455
456 case "script": 456 case "script":
457 m_localScenes.SendCommandToScripts(cmdparams); 457 m_localScenes.SendCommandToCurrentSceneScripts(cmdparams);
458 break; 458 break;
459 459
460 case "command-script": 460 case "command-script":
@@ -468,16 +468,16 @@ namespace OpenSim
468 // Treats each user as a super-admin when disabled 468 // Treats each user as a super-admin when disabled
469 bool permissions = Convert.ToBoolean(cmdparams[0]); 469 bool permissions = Convert.ToBoolean(cmdparams[0]);
470 470
471 m_localScenes.BypassPermissions(!permissions); 471 m_localScenes.SetBypassPermissionsOnCurrentScene(!permissions);
472 472
473 break; 473 break;
474 474
475 case "backup": 475 case "backup":
476 m_localScenes.Backup(); 476 m_localScenes.BackupCurrentScene();
477 break; 477 break;
478 478
479 case "alert": 479 case "alert":
480 m_localScenes.HandleAlertCommand(cmdparams); 480 m_localScenes.HandleAlertCommandOnCurrentScene(cmdparams);
481 break; 481 break;
482 482
483 case "create": 483 case "create":
@@ -497,7 +497,7 @@ namespace OpenSim
497 { 497 {
498 string regionName = this.CombineParams(cmdparams, 0); 498 string regionName = this.CombineParams(cmdparams, 0);
499 499
500 if (m_localScenes.TrySetCurrentRegion(regionName)) 500 if (m_localScenes.TrySetCurrentScene(regionName))
501 { 501 {
502 502
503 } 503 }
@@ -535,7 +535,7 @@ namespace OpenSim
535 int newDebug; 535 int newDebug;
536 if (int.TryParse(args[1], out newDebug)) 536 if (int.TryParse(args[1], out newDebug))
537 { 537 {
538 m_localScenes.DebugPacket(m_log, newDebug); 538 m_localScenes.SetDebugPacketOnCurrentScene(m_log, newDebug);
539 } 539 }
540 else 540 else
541 { 541 {
@@ -568,7 +568,7 @@ namespace OpenSim
568 case "users": 568 case "users":
569 m_log.Error(String.Format("{0,-16}{1,-16}{2,-25}{3,-25}{4,-16}{5,-16}{6,-16}", "Firstname", "Lastname", "Agent ID", "Session ID", "Circuit", "IP", "World")); 569 m_log.Error(String.Format("{0,-16}{1,-16}{2,-25}{3,-25}{4,-16}{5,-16}{6,-16}", "Firstname", "Lastname", "Agent ID", "Session ID", "Circuit", "IP", "World"));
570 570
571 List<ScenePresence> avatars = m_localScenes.GetAvatars(); 571 List<ScenePresence> avatars = m_localScenes.GetCurrentSceneAvatars();
572 572
573 foreach (ScenePresence avatar in avatars) 573 foreach (ScenePresence avatar in avatars)
574 { 574 {