aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Region/Application
diff options
context:
space:
mode:
Diffstat (limited to 'OpenSim/Region/Application')
-rwxr-xr-x[-rw-r--r--]OpenSim/Region/Application/OpenSim.cs122
1 files changed, 63 insertions, 59 deletions
diff --git a/OpenSim/Region/Application/OpenSim.cs b/OpenSim/Region/Application/OpenSim.cs
index 10ff57d..693aedc 100644..100755
--- a/OpenSim/Region/Application/OpenSim.cs
+++ b/OpenSim/Region/Application/OpenSim.cs
@@ -409,7 +409,7 @@ namespace OpenSim
409 if (presence.Firstname.ToLower().Contains(cmdparams[2].ToLower()) && 409 if (presence.Firstname.ToLower().Contains(cmdparams[2].ToLower()) &&
410 presence.Lastname.ToLower().Contains(cmdparams[3].ToLower())) 410 presence.Lastname.ToLower().Contains(cmdparams[3].ToLower()))
411 { 411 {
412 m_log.Info( 412 MainConsole.Instance.Output(
413 String.Format( 413 String.Format(
414 "Kicking user: {0,-16}{1,-16}{2,-37} in region: {3,-16}", 414 "Kicking user: {0,-16}{1,-16}{2,-37} in region: {3,-16}",
415 presence.Firstname, presence.Lastname, presence.UUID, regionInfo.RegionName)); 415 presence.Firstname, presence.Lastname, presence.UUID, regionInfo.RegionName));
@@ -424,7 +424,7 @@ namespace OpenSim
424 presence.Scene.IncomingCloseAgent(presence.UUID); 424 presence.Scene.IncomingCloseAgent(presence.UUID);
425 } 425 }
426 } 426 }
427 m_log.Info(""); 427 MainConsole.Instance.Output("");
428 } 428 }
429 429
430 /// <summary> 430 /// <summary>
@@ -471,7 +471,7 @@ namespace OpenSim
471 471
472 private void HandleClearAssets(string module, string[] args) 472 private void HandleClearAssets(string module, string[] args)
473 { 473 {
474 m_log.Info("Not implemented."); 474 MainConsole.Instance.Output("Not implemented.");
475 } 475 }
476 476
477 /// <summary> 477 /// <summary>
@@ -481,7 +481,7 @@ namespace OpenSim
481 /// <param name="args"></param> 481 /// <param name="args"></param>
482 private void HandleForceUpdate(string module, string[] args) 482 private void HandleForceUpdate(string module, string[] args)
483 { 483 {
484 m_log.Info("Updating all clients"); 484 MainConsole.Instance.Output("Updating all clients");
485 m_sceneManager.ForceCurrentSceneClientUpdate(); 485 m_sceneManager.ForceCurrentSceneClientUpdate();
486 } 486 }
487 487
@@ -498,7 +498,7 @@ namespace OpenSim
498 } 498 }
499 else 499 else
500 { 500 {
501 m_log.Info("Argument error: edit scale <prim name> <x> <y> <z>"); 501 MainConsole.Instance.Output("Argument error: edit scale <prim name> <x> <y> <z>");
502 } 502 }
503 } 503 }
504 504
@@ -511,7 +511,7 @@ namespace OpenSim
511 { 511 {
512 if (cmd.Length < 4) 512 if (cmd.Length < 4)
513 { 513 {
514 m_log.Error("Usage: create region <region name> <region_file.ini>"); 514 MainConsole.Instance.Output("Usage: create region <region name> <region_file.ini>");
515 return; 515 return;
516 } 516 }
517 if (cmd[3].EndsWith(".xml")) 517 if (cmd[3].EndsWith(".xml"))
@@ -538,7 +538,7 @@ namespace OpenSim
538 } 538 }
539 else 539 else
540 { 540 {
541 m_log.Error("Usage: create region <region name> <region_file.ini>"); 541 MainConsole.Instance.Output("Usage: create region <region name> <region_file.ini>");
542 return; 542 return;
543 } 543 }
544 } 544 }
@@ -562,8 +562,8 @@ namespace OpenSim
562 case "set": 562 case "set":
563 if (cmdparams.Length < 4) 563 if (cmdparams.Length < 4)
564 { 564 {
565 m_log.Error("SYNTAX: " + n + " SET SECTION KEY VALUE"); 565 MainConsole.Instance.Output(String.Format("SYNTAX: {0} SET SECTION KEY VALUE",n));
566 m_log.Error("EXAMPLE: " + n + " SET ScriptEngine.DotNetEngine NumberOfScriptThreads 5"); 566 MainConsole.Instance.Output(String.Format("EXAMPLE: {0} SET ScriptEngine.DotNetEngine NumberOfScriptThreads 5",n));
567 } 567 }
568 else 568 else
569 { 569 {
@@ -576,8 +576,7 @@ namespace OpenSim
576 c.Set(cmdparams[2], _value); 576 c.Set(cmdparams[2], _value);
577 m_config.Source.Merge(source); 577 m_config.Source.Merge(source);
578 578
579 m_log.Error(n + " " + n + " " + cmdparams[1] + " " + cmdparams[2] + " " + 579 MainConsole.Instance.Output(String.Format("{0} {0} {1} {2} {3}",n,cmdparams[1],cmdparams[2],_value));
580 _value);
581 } 580 }
582 } 581 }
583 break; 582 break;
@@ -585,21 +584,21 @@ namespace OpenSim
585 case "get": 584 case "get":
586 if (cmdparams.Length < 3) 585 if (cmdparams.Length < 3)
587 { 586 {
588 m_log.Error("SYNTAX: " + n + " GET SECTION KEY"); 587 MainConsole.Instance.Output(String.Format("SYNTAX: {0} GET SECTION KEY",n));
589 m_log.Error("EXAMPLE: " + n + " GET ScriptEngine.DotNetEngine NumberOfScriptThreads"); 588 MainConsole.Instance.Output(String.Format("EXAMPLE: {0} GET ScriptEngine.DotNetEngine NumberOfScriptThreads",n));
590 } 589 }
591 else 590 else
592 { 591 {
593 IConfig c = m_config.Source.Configs[cmdparams[1]]; 592 IConfig c = m_config.Source.Configs[cmdparams[1]];
594 if (c == null) 593 if (c == null)
595 { 594 {
596 m_log.Info("Section \"" + cmdparams[1] + "\" does not exist."); 595 MainConsole.Instance.Output(String.Format("Section \"{0}\" does not exist.",cmdparams[1]));
597 break; 596 break;
598 } 597 }
599 else 598 else
600 { 599 {
601 m_log.Info(n + " GET " + cmdparams[1] + " " + cmdparams[2] + ": " + 600 MainConsole.Instance.Output(String.Format("{0} GET {1} {2} : {3}",n,cmdparams[1],cmdparams[2],
602 c.GetString(cmdparams[2])); 601 c.GetString(cmdparams[2])));
603 } 602 }
604 } 603 }
605 604
@@ -608,17 +607,17 @@ namespace OpenSim
608 case "save": 607 case "save":
609 if (cmdparams.Length < 2) 608 if (cmdparams.Length < 2)
610 { 609 {
611 m_log.Error("SYNTAX: " + n + " SAVE FILE"); 610 MainConsole.Instance.Output("SYNTAX: " + n + " SAVE FILE");
612 return; 611 return;
613 } 612 }
614 613
615 if (Application.iniFilePath == cmdparams[1]) 614 if (Application.iniFilePath == cmdparams[1])
616 { 615 {
617 m_log.Error("FILE can not be "+Application.iniFilePath); 616 MainConsole.Instance.Output("FILE can not be " + Application.iniFilePath);
618 return; 617 return;
619 } 618 }
620 619
621 m_log.Info("Saving configuration file: " + cmdparams[1]); 620 MainConsole.Instance.Output("Saving configuration file: " + cmdparams[1]);
622 m_config.Save(cmdparams[1]); 621 m_config.Save(cmdparams[1]);
623 break; 622 break;
624 } 623 }
@@ -644,7 +643,7 @@ namespace OpenSim
644 case "list": 643 case "list":
645 foreach (IRegionModule irm in m_moduleLoader.GetLoadedSharedModules) 644 foreach (IRegionModule irm in m_moduleLoader.GetLoadedSharedModules)
646 { 645 {
647 m_log.Info("Shared region module: " + irm.Name); 646 MainConsole.Instance.Output(String.Format("Shared region module: {0}", irm.Name));
648 } 647 }
649 break; 648 break;
650 case "unload": 649 case "unload":
@@ -654,7 +653,7 @@ namespace OpenSim
654 { 653 {
655 if (rm.Name.ToLower() == cmdparams[1].ToLower()) 654 if (rm.Name.ToLower() == cmdparams[1].ToLower())
656 { 655 {
657 m_log.Info("Unloading module: " + rm.Name); 656 MainConsole.Instance.Output(String.Format("Unloading module: {0}", rm.Name));
658 m_moduleLoader.UnloadModule(rm); 657 m_moduleLoader.UnloadModule(rm);
659 } 658 }
660 } 659 }
@@ -665,7 +664,7 @@ namespace OpenSim
665 { 664 {
666 foreach (Scene s in new ArrayList(m_sceneManager.Scenes)) 665 foreach (Scene s in new ArrayList(m_sceneManager.Scenes))
667 { 666 {
668 m_log.Info("Loading module: " + cmdparams[1]); 667 MainConsole.Instance.Output(String.Format("Loading module: {0}", cmdparams[1]));
669 m_moduleLoader.LoadRegionModules(cmdparams[1], s); 668 m_moduleLoader.LoadRegionModules(cmdparams[1], s);
670 } 669 }
671 } 670 }
@@ -710,7 +709,7 @@ namespace OpenSim
710 if (m_sceneManager.TryGetScene(regRemoveName, out removeScene)) 709 if (m_sceneManager.TryGetScene(regRemoveName, out removeScene))
711 RemoveRegion(removeScene, false); 710 RemoveRegion(removeScene, false);
712 else 711 else
713 m_log.Error("no region with that name"); 712 MainConsole.Instance.Output("no region with that name");
714 break; 713 break;
715 714
716 case "delete-region": 715 case "delete-region":
@@ -720,7 +719,7 @@ namespace OpenSim
720 if (m_sceneManager.TryGetScene(regDeleteName, out killScene)) 719 if (m_sceneManager.TryGetScene(regDeleteName, out killScene))
721 RemoveRegion(killScene, true); 720 RemoveRegion(killScene, true);
722 else 721 else
723 m_log.Error("no region with that name"); 722 MainConsole.Instance.Output("no region with that name");
724 break; 723 break;
725 724
726 case "restart": 725 case "restart":
@@ -730,7 +729,7 @@ namespace OpenSim
730 case "Add-InventoryHost": 729 case "Add-InventoryHost":
731 if (cmdparams.Length > 0) 730 if (cmdparams.Length > 0)
732 { 731 {
733 m_log.Info("Not implemented."); 732 MainConsole.Instance.Output("Not implemented.");
734 } 733 }
735 break; 734 break;
736 735
@@ -748,20 +747,19 @@ namespace OpenSim
748 string newRegionName = CombineParams(cmdparams, 2); 747 string newRegionName = CombineParams(cmdparams, 2);
749 748
750 if (!m_sceneManager.TrySetCurrentScene(newRegionName)) 749 if (!m_sceneManager.TrySetCurrentScene(newRegionName))
751 m_log.Error("Couldn't select region " + newRegionName); 750 MainConsole.Instance.Output(String.Format("Couldn't select region {0}", newRegionName));
752 } 751 }
753 else 752 else
754 { 753 {
755 m_log.Error("Usage: change region <region name>"); 754 MainConsole.Instance.Output("Usage: change region <region name>");
756 } 755 }
757 756
758 string regionName = (m_sceneManager.CurrentScene == null ? "root" : m_sceneManager.CurrentScene.RegionInfo.RegionName); 757 string regionName = (m_sceneManager.CurrentScene == null ? "root" : m_sceneManager.CurrentScene.RegionInfo.RegionName);
759 m_log.Info(String.Format("Currently selected region is {0}", regionName)); 758 MainConsole.Instance.Output(String.Format("Currently selected region is {0}", regionName));
760 m_console.DefaultPrompt = String.Format("Region ({0}) ", regionName); 759 m_console.DefaultPrompt = String.Format("Region ({0}) ", regionName);
761 m_console.ConsoleScene = m_sceneManager.CurrentScene; 760 m_console.ConsoleScene = m_sceneManager.CurrentScene;
762 } 761 }
763 762
764
765 /// <summary> 763 /// <summary>
766 /// Turn on some debugging values for OpenSim. 764 /// Turn on some debugging values for OpenSim.
767 /// </summary> 765 /// </summary>
@@ -783,9 +781,9 @@ namespace OpenSim
783 } 781 }
784 else 782 else
785 { 783 {
786 m_log.Error("packet debug should be 0..255"); 784 MainConsole.Instance.Output("packet debug should be 0..255");
787 } 785 }
788 m_log.Info("New packet debug: " + newDebug.ToString()); 786 MainConsole.Instance.Output(String.Format("New packet debug: {0}", newDebug));
789 } 787 }
790 788
791 break; 789 break;
@@ -795,7 +793,7 @@ namespace OpenSim
795 { 793 {
796 if (m_sceneManager.CurrentScene == null) 794 if (m_sceneManager.CurrentScene == null)
797 { 795 {
798 m_log.Info("Please use 'change region <regioname>' first"); 796 MainConsole.Instance.Output("Please use 'change region <regioname>' first");
799 } 797 }
800 else 798 else
801 { 799 {
@@ -804,7 +802,7 @@ namespace OpenSim
804 bool physicsOn = !Convert.ToBoolean(args[4]); 802 bool physicsOn = !Convert.ToBoolean(args[4]);
805 m_sceneManager.CurrentScene.SetSceneCoreDebug(scriptingOn, collisionsOn, physicsOn); 803 m_sceneManager.CurrentScene.SetSceneCoreDebug(scriptingOn, collisionsOn, physicsOn);
806 804
807 m_log.Info( 805 MainConsole.Instance.Output(
808 String.Format( 806 String.Format(
809 "Set debug scene scripting = {0}, collisions = {1}, physics = {2}", 807 "Set debug scene scripting = {0}, collisions = {1}, physics = {2}",
810 !scriptingOn, !collisionsOn, !physicsOn)); 808 !scriptingOn, !collisionsOn, !physicsOn));
@@ -812,13 +810,13 @@ namespace OpenSim
812 } 810 }
813 else 811 else
814 { 812 {
815 m_log.Error("debug scene <scripting> <collisions> <physics> (where inside <> is true/false)"); 813 MainConsole.Instance.Output("debug scene <scripting> <collisions> <physics> (where inside <> is true/false)");
816 } 814 }
817 815
818 break; 816 break;
819 817
820 default: 818 default:
821 m_log.Error("Unknown debug"); 819 MainConsole.Instance.Output("Unknown debug");
822 break; 820 break;
823 } 821 }
824 } 822 }
@@ -840,7 +838,7 @@ namespace OpenSim
840 switch (showParams[0]) 838 switch (showParams[0])
841 { 839 {
842 case "assets": 840 case "assets":
843 m_log.Info("Not implemented."); 841 MainConsole.Instance.Output("Not implemented.");
844 break; 842 break;
845 843
846 case "users": 844 case "users":
@@ -854,9 +852,9 @@ namespace OpenSim
854 agents = m_sceneManager.GetCurrentSceneAvatars(); 852 agents = m_sceneManager.GetCurrentSceneAvatars();
855 } 853 }
856 854
857 m_log.Info(String.Format("\nAgents connected: {0}\n", agents.Count)); 855 MainConsole.Instance.Output(String.Format("\nAgents connected: {0}\n", agents.Count));
858 856
859 m_log.Info( 857 MainConsole.Instance.Output(
860 String.Format("{0,-16}{1,-16}{2,-37}{3,-11}{4,-16}{5,-30}", "Firstname", "Lastname", 858 String.Format("{0,-16}{1,-16}{2,-37}{3,-11}{4,-16}{5,-30}", "Firstname", "Lastname",
861 "Agent ID", "Root/Child", "Region", "Position")); 859 "Agent ID", "Root/Child", "Region", "Position"));
862 860
@@ -874,7 +872,7 @@ namespace OpenSim
874 regionName = regionInfo.RegionName; 872 regionName = regionInfo.RegionName;
875 } 873 }
876 874
877 m_log.Info( 875 MainConsole.Instance.Output(
878 String.Format( 876 String.Format(
879 "{0,-16}{1,-16}{2,-37}{3,-11}{4,-16}{5,-30}", 877 "{0,-16}{1,-16}{2,-37}{3,-11}{4,-16}{5,-30}",
880 presence.Firstname, 878 presence.Firstname,
@@ -885,7 +883,7 @@ namespace OpenSim
885 presence.AbsolutePosition.ToString())); 883 presence.AbsolutePosition.ToString()));
886 } 884 }
887 885
888 m_log.Info(String.Empty); 886 MainConsole.Instance.Output(String.Empty);
889 break; 887 break;
890 888
891 case "connections": 889 case "connections":
@@ -903,25 +901,30 @@ namespace OpenSim
903 } 901 }
904 ); 902 );
905 903
906 m_log.Info(connections.ToString()); 904 MainConsole.Instance.Output(connections.ToString());
907 break; 905 break;
908 906
909 case "modules": 907 case "modules":
910 m_log.Info("The currently loaded shared modules are:"); 908 MainConsole.Instance.Output("The currently loaded shared modules are:");
911 foreach (IRegionModule module in m_moduleLoader.GetLoadedSharedModules) 909 foreach (IRegionModule module in m_moduleLoader.GetLoadedSharedModules)
912 { 910 {
913 m_log.Info("Shared Module: " + module.Name); 911 MainConsole.Instance.Output("Shared Module: " + module.Name);
914 } 912 }
913
914 MainConsole.Instance.Output("");
915 break; 915 break;
916 916
917 case "regions": 917 case "regions":
918 m_sceneManager.ForEachScene( 918 m_sceneManager.ForEachScene(
919 delegate(Scene scene) 919 delegate(Scene scene)
920 { 920 {
921 m_log.Info("Region Name: " + scene.RegionInfo.RegionName + " , Region XLoc: " + 921 MainConsole.Instance.Output(String.Format(
922 scene.RegionInfo.RegionLocX + " , Region YLoc: " + 922 "Region Name: {0}, Region XLoc: {1}, Region YLoc: {2}, Region Port: {3}",
923 scene.RegionInfo.RegionLocY + " , Region Port: " + 923 scene.RegionInfo.RegionName,
924 scene.RegionInfo.InternalEndPoint.Port.ToString()); 924 scene.RegionInfo.RegionLocX,
925 scene.RegionInfo.RegionLocY,
926 scene.RegionInfo.InternalEndPoint.Port));
927
925 }); 928 });
926 break; 929 break;
927 930
@@ -946,8 +949,10 @@ namespace OpenSim
946 { 949 {
947 rating = "PG"; 950 rating = "PG";
948 } 951 }
949 m_log.Info("Region Name: " + scene.RegionInfo.RegionName + " , Region Rating: " + 952 MainConsole.Instance.Output(String.Format(
950 rating); 953 "Region Name: {0}, Region Rating {1}",
954 scene.RegionInfo.RegionName,
955 rating));
951 }); 956 });
952 break; 957 break;
953 } 958 }
@@ -968,7 +973,7 @@ namespace OpenSim
968 if (client is IStatsCollector) 973 if (client is IStatsCollector)
969 { 974 {
970 report = report + client.FirstName + 975 report = report + client.FirstName +
971 " " + client.LastName + "\n"; 976 " " + client.LastName;
972 977
973 IStatsCollector stats = 978 IStatsCollector stats =
974 (IStatsCollector) client; 979 (IStatsCollector) client;
@@ -985,7 +990,7 @@ namespace OpenSim
985 "Texture", 990 "Texture",
986 "Asset"); 991 "Asset");
987 report = report + stats.Report() + 992 report = report + stats.Report() +
988 "\n\n"; 993 "\n";
989 } 994 }
990 }); 995 });
991 }); 996 });
@@ -1017,7 +1022,7 @@ namespace OpenSim
1017 /// <param name="cmdparams"></param> 1022 /// <param name="cmdparams"></param>
1018 protected void SaveXml(string module, string[] cmdparams) 1023 protected void SaveXml(string module, string[] cmdparams)
1019 { 1024 {
1020 m_log.Error("[CONSOLE]: PLEASE NOTE, save-xml is DEPRECATED and may be REMOVED soon. If you are using this and there is some reason you can't use save-xml2, please file a mantis detailing the reason."); 1025 MainConsole.Instance.Output("PLEASE NOTE, save-xml is DEPRECATED and may be REMOVED soon. If you are using this and there is some reason you can't use save-xml2, please file a mantis detailing the reason.");
1021 1026
1022 if (cmdparams.Length > 0) 1027 if (cmdparams.Length > 0)
1023 { 1028 {
@@ -1036,7 +1041,7 @@ namespace OpenSim
1036 /// <param name="cmdparams"></param> 1041 /// <param name="cmdparams"></param>
1037 protected void LoadXml(string module, string[] cmdparams) 1042 protected void LoadXml(string module, string[] cmdparams)
1038 { 1043 {
1039 m_log.Error("[CONSOLE]: PLEASE NOTE, load-xml is DEPRECATED and may be REMOVED soon. If you are using this and there is some reason you can't use load-xml2, please file a mantis detailing the reason."); 1044 MainConsole.Instance.Output("PLEASE NOTE, load-xml is DEPRECATED and may be REMOVED soon. If you are using this and there is some reason you can't use load-xml2, please file a mantis detailing the reason.");
1040 1045
1041 Vector3 loadOffset = new Vector3(0, 0, 0); 1046 Vector3 loadOffset = new Vector3(0, 0, 0);
1042 if (cmdparams.Length > 2) 1047 if (cmdparams.Length > 2)
@@ -1059,8 +1064,7 @@ namespace OpenSim
1059 { 1064 {
1060 loadOffset.Z = (float) Convert.ToDecimal(cmdparams[6]); 1065 loadOffset.Z = (float) Convert.ToDecimal(cmdparams[6]);
1061 } 1066 }
1062 m_log.Error("loadOffsets <X,Y,Z> = <" + loadOffset.X + "," + loadOffset.Y + "," + 1067 MainConsole.Instance.Output(String.Format("loadOffsets <X,Y,Z> = <{0},{1},{2}>",loadOffset.X,loadOffset.Y,loadOffset.Z));
1063 loadOffset.Z + ">");
1064 } 1068 }
1065 } 1069 }
1066 m_sceneManager.LoadCurrentSceneFromXml(cmdparams[0], generateNewIDS, loadOffset); 1070 m_sceneManager.LoadCurrentSceneFromXml(cmdparams[0], generateNewIDS, loadOffset);
@@ -1073,7 +1077,7 @@ namespace OpenSim
1073 } 1077 }
1074 catch (FileNotFoundException) 1078 catch (FileNotFoundException)
1075 { 1079 {
1076 m_log.Error("Default xml not found. Usage: load-xml <filename>"); 1080 MainConsole.Instance.Output("Default xml not found. Usage: load-xml <filename>");
1077 } 1081 }
1078 } 1082 }
1079 } 1083 }
@@ -1109,7 +1113,7 @@ namespace OpenSim
1109 } 1113 }
1110 catch (FileNotFoundException) 1114 catch (FileNotFoundException)
1111 { 1115 {
1112 m_log.Error("Specified xml not found. Usage: load xml2 <filename>"); 1116 MainConsole.Instance.Output("Specified xml not found. Usage: load xml2 <filename>");
1113 } 1117 }
1114 } 1118 }
1115 else 1119 else
@@ -1120,7 +1124,7 @@ namespace OpenSim
1120 } 1124 }
1121 catch (FileNotFoundException) 1125 catch (FileNotFoundException)
1122 { 1126 {
1123 m_log.Error("Default xml not found. Usage: load xml2 <filename>"); 1127 MainConsole.Instance.Output("Default xml not found. Usage: load xml2 <filename>");
1124 } 1128 }
1125 } 1129 }
1126 } 1130 }
@@ -1137,7 +1141,7 @@ namespace OpenSim
1137 } 1141 }
1138 catch (Exception e) 1142 catch (Exception e)
1139 { 1143 {
1140 m_log.Error(e.Message); 1144 MainConsole.Instance.Output(e.Message);
1141 } 1145 }
1142 } 1146 }
1143 1147
generated by cgit v1.1 at 2024-11-19 05:58:25 +0000