aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Region
diff options
context:
space:
mode:
Diffstat (limited to '')
-rwxr-xr-x[-rw-r--r--]OpenSim/Region/Application/OpenSim.cs127
1 files changed, 66 insertions, 61 deletions
diff --git a/OpenSim/Region/Application/OpenSim.cs b/OpenSim/Region/Application/OpenSim.cs
index e09d730..eccd276 100644..100755
--- a/OpenSim/Region/Application/OpenSim.cs
+++ b/OpenSim/Region/Application/OpenSim.cs
@@ -425,7 +425,7 @@ namespace OpenSim
425 if (presence.Firstname.ToLower().Contains(cmdparams[2].ToLower()) && 425 if (presence.Firstname.ToLower().Contains(cmdparams[2].ToLower()) &&
426 presence.Lastname.ToLower().Contains(cmdparams[3].ToLower())) 426 presence.Lastname.ToLower().Contains(cmdparams[3].ToLower()))
427 { 427 {
428 m_log.Info( 428 MainConsole.Instance.Output(
429 String.Format( 429 String.Format(
430 "Kicking user: {0,-16}{1,-16}{2,-37} in region: {3,-16}", 430 "Kicking user: {0,-16}{1,-16}{2,-37} in region: {3,-16}",
431 presence.Firstname, presence.Lastname, presence.UUID, regionInfo.RegionName)); 431 presence.Firstname, presence.Lastname, presence.UUID, regionInfo.RegionName));
@@ -440,7 +440,7 @@ namespace OpenSim
440 presence.Scene.IncomingCloseAgent(presence.UUID); 440 presence.Scene.IncomingCloseAgent(presence.UUID);
441 } 441 }
442 } 442 }
443 m_log.Info(""); 443 MainConsole.Instance.Output("");
444 } 444 }
445 445
446 /// <summary> 446 /// <summary>
@@ -487,7 +487,7 @@ namespace OpenSim
487 487
488 private void HandleClearAssets(string module, string[] args) 488 private void HandleClearAssets(string module, string[] args)
489 { 489 {
490 m_log.Info("Not implemented."); 490 MainConsole.Instance.Output("Not implemented.");
491 } 491 }
492 492
493 /// <summary> 493 /// <summary>
@@ -497,7 +497,7 @@ namespace OpenSim
497 /// <param name="args"></param> 497 /// <param name="args"></param>
498 private void HandleForceUpdate(string module, string[] args) 498 private void HandleForceUpdate(string module, string[] args)
499 { 499 {
500 m_log.Info("Updating all clients"); 500 MainConsole.Instance.Output("Updating all clients");
501 m_sceneManager.ForceCurrentSceneClientUpdate(); 501 m_sceneManager.ForceCurrentSceneClientUpdate();
502 } 502 }
503 503
@@ -514,7 +514,7 @@ namespace OpenSim
514 } 514 }
515 else 515 else
516 { 516 {
517 m_log.Info("Argument error: edit scale <prim name> <x> <y> <z>"); 517 MainConsole.Instance.Output("Argument error: edit scale <prim name> <x> <y> <z>");
518 } 518 }
519 } 519 }
520 520
@@ -527,7 +527,7 @@ namespace OpenSim
527 { 527 {
528 if (cmd.Length < 4) 528 if (cmd.Length < 4)
529 { 529 {
530 m_log.Error("Usage: create region <region name> <region_file.ini>"); 530 MainConsole.Instance.Output("Usage: create region <region name> <region_file.ini>");
531 return; 531 return;
532 } 532 }
533 if (cmd[3].EndsWith(".xml")) 533 if (cmd[3].EndsWith(".xml"))
@@ -554,7 +554,7 @@ namespace OpenSim
554 } 554 }
555 else 555 else
556 { 556 {
557 m_log.Error("Usage: create region <region name> <region_file.ini>"); 557 MainConsole.Instance.Output("Usage: create region <region name> <region_file.ini>");
558 return; 558 return;
559 } 559 }
560 } 560 }
@@ -578,8 +578,8 @@ namespace OpenSim
578 case "set": 578 case "set":
579 if (cmdparams.Length < 4) 579 if (cmdparams.Length < 4)
580 { 580 {
581 m_log.Error("SYNTAX: " + n + " SET SECTION KEY VALUE"); 581 MainConsole.Instance.Output(String.Format("SYNTAX: {0} SET SECTION KEY VALUE",n));
582 m_log.Error("EXAMPLE: " + n + " SET ScriptEngine.DotNetEngine NumberOfScriptThreads 5"); 582 MainConsole.Instance.Output(String.Format("EXAMPLE: {0} SET ScriptEngine.DotNetEngine NumberOfScriptThreads 5",n));
583 } 583 }
584 else 584 else
585 { 585 {
@@ -592,8 +592,7 @@ namespace OpenSim
592 c.Set(cmdparams[2], _value); 592 c.Set(cmdparams[2], _value);
593 m_config.Source.Merge(source); 593 m_config.Source.Merge(source);
594 594
595 m_log.Error(n + " " + n + " " + cmdparams[1] + " " + cmdparams[2] + " " + 595 MainConsole.Instance.Output(String.Format("{0} {0} {1} {2} {3}",n,cmdparams[1],cmdparams[2],_value));
596 _value);
597 } 596 }
598 } 597 }
599 break; 598 break;
@@ -601,21 +600,21 @@ namespace OpenSim
601 case "get": 600 case "get":
602 if (cmdparams.Length < 3) 601 if (cmdparams.Length < 3)
603 { 602 {
604 m_log.Error("SYNTAX: " + n + " GET SECTION KEY"); 603 MainConsole.Instance.Output(String.Format("SYNTAX: {0} GET SECTION KEY",n));
605 m_log.Error("EXAMPLE: " + n + " GET ScriptEngine.DotNetEngine NumberOfScriptThreads"); 604 MainConsole.Instance.Output(String.Format("EXAMPLE: {0} GET ScriptEngine.DotNetEngine NumberOfScriptThreads",n));
606 } 605 }
607 else 606 else
608 { 607 {
609 IConfig c = m_config.Source.Configs[cmdparams[1]]; 608 IConfig c = m_config.Source.Configs[cmdparams[1]];
610 if (c == null) 609 if (c == null)
611 { 610 {
612 m_log.Info("Section \"" + cmdparams[1] + "\" does not exist."); 611 MainConsole.Instance.Output(String.Format("Section \"{0}\" does not exist.",cmdparams[1]));
613 break; 612 break;
614 } 613 }
615 else 614 else
616 { 615 {
617 m_log.Info(n + " GET " + cmdparams[1] + " " + cmdparams[2] + ": " + 616 MainConsole.Instance.Output(String.Format("{0} GET {1} {2} : {3}",n,cmdparams[1],cmdparams[2],
618 c.GetString(cmdparams[2])); 617 c.GetString(cmdparams[2])));
619 } 618 }
620 } 619 }
621 620
@@ -624,17 +623,17 @@ namespace OpenSim
624 case "save": 623 case "save":
625 if (cmdparams.Length < 2) 624 if (cmdparams.Length < 2)
626 { 625 {
627 m_log.Error("SYNTAX: " + n + " SAVE FILE"); 626 MainConsole.Instance.Output("SYNTAX: " + n + " SAVE FILE");
628 return; 627 return;
629 } 628 }
630 629
631 if (Application.iniFilePath == cmdparams[1]) 630 if (Application.iniFilePath == cmdparams[1])
632 { 631 {
633 m_log.Error("FILE can not be "+Application.iniFilePath); 632 MainConsole.Instance.Output("FILE can not be " + Application.iniFilePath);
634 return; 633 return;
635 } 634 }
636 635
637 m_log.Info("Saving configuration file: " + cmdparams[1]); 636 MainConsole.Instance.Output("Saving configuration file: " + cmdparams[1]);
638 m_config.Save(cmdparams[1]); 637 m_config.Save(cmdparams[1]);
639 break; 638 break;
640 } 639 }
@@ -660,7 +659,7 @@ namespace OpenSim
660 case "list": 659 case "list":
661 foreach (IRegionModule irm in m_moduleLoader.GetLoadedSharedModules) 660 foreach (IRegionModule irm in m_moduleLoader.GetLoadedSharedModules)
662 { 661 {
663 m_log.Info("Shared region module: " + irm.Name); 662 MainConsole.Instance.Output(String.Format("Shared region module: {0}", irm.Name));
664 } 663 }
665 break; 664 break;
666 case "unload": 665 case "unload":
@@ -670,7 +669,7 @@ namespace OpenSim
670 { 669 {
671 if (rm.Name.ToLower() == cmdparams[1].ToLower()) 670 if (rm.Name.ToLower() == cmdparams[1].ToLower())
672 { 671 {
673 m_log.Info("Unloading module: " + rm.Name); 672 MainConsole.Instance.Output(String.Format("Unloading module: {0}", rm.Name));
674 m_moduleLoader.UnloadModule(rm); 673 m_moduleLoader.UnloadModule(rm);
675 } 674 }
676 } 675 }
@@ -681,7 +680,7 @@ namespace OpenSim
681 { 680 {
682 foreach (Scene s in new ArrayList(m_sceneManager.Scenes)) 681 foreach (Scene s in new ArrayList(m_sceneManager.Scenes))
683 { 682 {
684 m_log.Info("Loading module: " + cmdparams[1]); 683 MainConsole.Instance.Output(String.Format("Loading module: {0}", cmdparams[1]));
685 m_moduleLoader.LoadRegionModules(cmdparams[1], s); 684 m_moduleLoader.LoadRegionModules(cmdparams[1], s);
686 } 685 }
687 } 686 }
@@ -726,7 +725,7 @@ namespace OpenSim
726 if (m_sceneManager.TryGetScene(regRemoveName, out removeScene)) 725 if (m_sceneManager.TryGetScene(regRemoveName, out removeScene))
727 RemoveRegion(removeScene, false); 726 RemoveRegion(removeScene, false);
728 else 727 else
729 m_log.Error("no region with that name"); 728 MainConsole.Instance.Output("no region with that name");
730 break; 729 break;
731 730
732 case "delete-region": 731 case "delete-region":
@@ -736,7 +735,7 @@ namespace OpenSim
736 if (m_sceneManager.TryGetScene(regDeleteName, out killScene)) 735 if (m_sceneManager.TryGetScene(regDeleteName, out killScene))
737 RemoveRegion(killScene, true); 736 RemoveRegion(killScene, true);
738 else 737 else
739 m_log.Error("no region with that name"); 738 MainConsole.Instance.Output("no region with that name");
740 break; 739 break;
741 740
742 case "restart": 741 case "restart":
@@ -746,7 +745,7 @@ namespace OpenSim
746 case "Add-InventoryHost": 745 case "Add-InventoryHost":
747 if (cmdparams.Length > 0) 746 if (cmdparams.Length > 0)
748 { 747 {
749 m_log.Info("Not implemented."); 748 MainConsole.Instance.Output("Not implemented.");
750 } 749 }
751 break; 750 break;
752 751
@@ -764,15 +763,15 @@ namespace OpenSim
764 string newRegionName = CombineParams(cmdparams, 2); 763 string newRegionName = CombineParams(cmdparams, 2);
765 764
766 if (!m_sceneManager.TrySetCurrentScene(newRegionName)) 765 if (!m_sceneManager.TrySetCurrentScene(newRegionName))
767 m_log.Error("Couldn't select region " + newRegionName); 766 MainConsole.Instance.Output(String.Format("Couldn't select region {0}", newRegionName));
768 } 767 }
769 else 768 else
770 { 769 {
771 m_log.Error("Usage: change region <region name>"); 770 MainConsole.Instance.Output("Usage: change region <region name>");
772 } 771 }
773 772
774 string regionName = (m_sceneManager.CurrentScene == null ? "root" : m_sceneManager.CurrentScene.RegionInfo.RegionName); 773 string regionName = (m_sceneManager.CurrentScene == null ? "root" : m_sceneManager.CurrentScene.RegionInfo.RegionName);
775 m_log.Info(String.Format("Currently selected region is {0}", regionName)); 774 MainConsole.Instance.Output(String.Format("Currently selected region is {0}", regionName));
776 m_console.DefaultPrompt = String.Format("Region ({0}) ", regionName); 775 m_console.DefaultPrompt = String.Format("Region ({0}) ", regionName);
777 m_console.ConsoleScene = m_sceneManager.CurrentScene; 776 m_console.ConsoleScene = m_sceneManager.CurrentScene;
778 } 777 }
@@ -789,7 +788,7 @@ namespace OpenSim
789 } 788 }
790 else 789 else
791 { 790 {
792 m_log.Info("Create user is not available in grid mode, use the user server."); 791 MainConsole.Instance.Output("Create user is not available in grid mode, use the user server.");
793 } 792 }
794 } 793 }
795 794
@@ -805,7 +804,7 @@ namespace OpenSim
805 } 804 }
806 else 805 else
807 { 806 {
808 m_log.Info("Reset user password is not available in grid mode, use the user-server."); 807 MainConsole.Instance.Output("Reset user password is not available in grid mode, use the user-server.");
809 } 808 }
810 } 809 }
811 810
@@ -830,9 +829,9 @@ namespace OpenSim
830 } 829 }
831 else 830 else
832 { 831 {
833 m_log.Error("packet debug should be 0..255"); 832 MainConsole.Instance.Output("packet debug should be 0..255");
834 } 833 }
835 m_log.Info("New packet debug: " + newDebug.ToString()); 834 MainConsole.Instance.Output(String.Format("New packet debug: {0}", newDebug));
836 } 835 }
837 836
838 break; 837 break;
@@ -842,7 +841,7 @@ namespace OpenSim
842 { 841 {
843 if (m_sceneManager.CurrentScene == null) 842 if (m_sceneManager.CurrentScene == null)
844 { 843 {
845 m_log.Info("Please use 'change region <regioname>' first"); 844 MainConsole.Instance.Output("Please use 'change region <regioname>' first");
846 } 845 }
847 else 846 else
848 { 847 {
@@ -851,7 +850,7 @@ namespace OpenSim
851 bool physicsOn = !Convert.ToBoolean(args[4]); 850 bool physicsOn = !Convert.ToBoolean(args[4]);
852 m_sceneManager.CurrentScene.SetSceneCoreDebug(scriptingOn, collisionsOn, physicsOn); 851 m_sceneManager.CurrentScene.SetSceneCoreDebug(scriptingOn, collisionsOn, physicsOn);
853 852
854 m_log.Info( 853 MainConsole.Instance.Output(
855 String.Format( 854 String.Format(
856 "Set debug scene scripting = {0}, collisions = {1}, physics = {2}", 855 "Set debug scene scripting = {0}, collisions = {1}, physics = {2}",
857 !scriptingOn, !collisionsOn, !physicsOn)); 856 !scriptingOn, !collisionsOn, !physicsOn));
@@ -859,13 +858,13 @@ namespace OpenSim
859 } 858 }
860 else 859 else
861 { 860 {
862 m_log.Error("debug scene <scripting> <collisions> <physics> (where inside <> is true/false)"); 861 MainConsole.Instance.Output("debug scene <scripting> <collisions> <physics> (where inside <> is true/false)");
863 } 862 }
864 863
865 break; 864 break;
866 865
867 default: 866 default:
868 m_log.Error("Unknown debug"); 867 MainConsole.Instance.Output("Unknown debug");
869 break; 868 break;
870 } 869 }
871 } 870 }
@@ -887,7 +886,7 @@ namespace OpenSim
887 switch (showParams[0]) 886 switch (showParams[0])
888 { 887 {
889 case "assets": 888 case "assets":
890 m_log.Info("Not implemented."); 889 MainConsole.Instance.Output("Not implemented.");
891 break; 890 break;
892 891
893 case "users": 892 case "users":
@@ -901,9 +900,9 @@ namespace OpenSim
901 agents = m_sceneManager.GetCurrentSceneAvatars(); 900 agents = m_sceneManager.GetCurrentSceneAvatars();
902 } 901 }
903 902
904 m_log.Info(String.Format("\nAgents connected: {0}\n", agents.Count)); 903 MainConsole.Instance.Output(String.Format("\nAgents connected: {0}\n", agents.Count));
905 904
906 m_log.Info( 905 MainConsole.Instance.Output(
907 String.Format("{0,-16}{1,-16}{2,-37}{3,-11}{4,-16}{5,-30}", "Firstname", "Lastname", 906 String.Format("{0,-16}{1,-16}{2,-37}{3,-11}{4,-16}{5,-30}", "Firstname", "Lastname",
908 "Agent ID", "Root/Child", "Region", "Position")); 907 "Agent ID", "Root/Child", "Region", "Position"));
909 908
@@ -921,7 +920,7 @@ namespace OpenSim
921 regionName = regionInfo.RegionName; 920 regionName = regionInfo.RegionName;
922 } 921 }
923 922
924 m_log.Info( 923 MainConsole.Instance.Output(
925 String.Format( 924 String.Format(
926 "{0,-16}{1,-16}{2,-37}{3,-11}{4,-16}{5,-30}", 925 "{0,-16}{1,-16}{2,-37}{3,-11}{4,-16}{5,-30}",
927 presence.Firstname, 926 presence.Firstname,
@@ -932,7 +931,7 @@ namespace OpenSim
932 presence.AbsolutePosition.ToString())); 931 presence.AbsolutePosition.ToString()));
933 } 932 }
934 933
935 m_log.Info(String.Empty); 934 MainConsole.Instance.Output(String.Empty);
936 break; 935 break;
937 936
938 case "connections": 937 case "connections":
@@ -950,25 +949,30 @@ namespace OpenSim
950 } 949 }
951 ); 950 );
952 951
953 m_log.Info(connections.ToString()); 952 MainConsole.Instance.Output(connections.ToString());
954 break; 953 break;
955 954
956 case "modules": 955 case "modules":
957 m_log.Info("The currently loaded shared modules are:"); 956 MainConsole.Instance.Output("The currently loaded shared modules are:");
958 foreach (IRegionModule module in m_moduleLoader.GetLoadedSharedModules) 957 foreach (IRegionModule module in m_moduleLoader.GetLoadedSharedModules)
959 { 958 {
960 m_log.Info("Shared Module: " + module.Name); 959 MainConsole.Instance.Output("Shared Module: " + module.Name);
961 } 960 }
961
962 MainConsole.Instance.Output("");
962 break; 963 break;
963 964
964 case "regions": 965 case "regions":
965 m_sceneManager.ForEachScene( 966 m_sceneManager.ForEachScene(
966 delegate(Scene scene) 967 delegate(Scene scene)
967 { 968 {
968 m_log.Info("Region Name: " + scene.RegionInfo.RegionName + " , Region XLoc: " + 969 MainConsole.Instance.Output(String.Format(
969 scene.RegionInfo.RegionLocX + " , Region YLoc: " + 970 "Region Name: {0}, Region XLoc: {1}, Region YLoc: {2}, Region Port: {3}",
970 scene.RegionInfo.RegionLocY + " , Region Port: " + 971 scene.RegionInfo.RegionName,
971 scene.RegionInfo.InternalEndPoint.Port.ToString()); 972 scene.RegionInfo.RegionLocX,
973 scene.RegionInfo.RegionLocY,
974 scene.RegionInfo.InternalEndPoint.Port));
975
972 }); 976 });
973 break; 977 break;
974 978
@@ -993,8 +997,10 @@ namespace OpenSim
993 { 997 {
994 rating = "PG"; 998 rating = "PG";
995 } 999 }
996 m_log.Info("Region Name: " + scene.RegionInfo.RegionName + " , Region Rating: " + 1000 MainConsole.Instance.Output(String.Format(
997 rating); 1001 "Region Name: {0}, Region Rating {1}",
1002 scene.RegionInfo.RegionName,
1003 rating));
998 }); 1004 });
999 break; 1005 break;
1000 } 1006 }
@@ -1015,7 +1021,7 @@ namespace OpenSim
1015 if (client is IStatsCollector) 1021 if (client is IStatsCollector)
1016 { 1022 {
1017 report = report + client.FirstName + 1023 report = report + client.FirstName +
1018 " " + client.LastName + "\n"; 1024 " " + client.LastName;
1019 1025
1020 IStatsCollector stats = 1026 IStatsCollector stats =
1021 (IStatsCollector) client; 1027 (IStatsCollector) client;
@@ -1032,7 +1038,7 @@ namespace OpenSim
1032 "Texture", 1038 "Texture",
1033 "Asset"); 1039 "Asset");
1034 report = report + stats.Report() + 1040 report = report + stats.Report() +
1035 "\n\n"; 1041 "\n";
1036 } 1042 }
1037 }); 1043 });
1038 }); 1044 });
@@ -1091,7 +1097,7 @@ namespace OpenSim
1091 } 1097 }
1092 else 1098 else
1093 { 1099 {
1094 m_log.ErrorFormat("[CONSOLE]: A user with the name {0} {1} already exists!", firstName, lastName); 1100 MainConsole.Instance.Output(string.Format("A user with the name {0} {1} already exists!", firstName, lastName));
1095 } 1101 }
1096 } 1102 }
1097 1103
@@ -1144,7 +1150,7 @@ namespace OpenSim
1144 /// <param name="cmdparams"></param> 1150 /// <param name="cmdparams"></param>
1145 protected void SaveXml(string module, string[] cmdparams) 1151 protected void SaveXml(string module, string[] cmdparams)
1146 { 1152 {
1147 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."); 1153 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.");
1148 1154
1149 if (cmdparams.Length > 0) 1155 if (cmdparams.Length > 0)
1150 { 1156 {
@@ -1163,7 +1169,7 @@ namespace OpenSim
1163 /// <param name="cmdparams"></param> 1169 /// <param name="cmdparams"></param>
1164 protected void LoadXml(string module, string[] cmdparams) 1170 protected void LoadXml(string module, string[] cmdparams)
1165 { 1171 {
1166 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."); 1172 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.");
1167 1173
1168 Vector3 loadOffset = new Vector3(0, 0, 0); 1174 Vector3 loadOffset = new Vector3(0, 0, 0);
1169 if (cmdparams.Length > 2) 1175 if (cmdparams.Length > 2)
@@ -1186,8 +1192,7 @@ namespace OpenSim
1186 { 1192 {
1187 loadOffset.Z = (float) Convert.ToDecimal(cmdparams[6]); 1193 loadOffset.Z = (float) Convert.ToDecimal(cmdparams[6]);
1188 } 1194 }
1189 m_log.Error("loadOffsets <X,Y,Z> = <" + loadOffset.X + "," + loadOffset.Y + "," + 1195 MainConsole.Instance.Output(String.Format("loadOffsets <X,Y,Z> = <{0},{1},{2}>",loadOffset.X,loadOffset.Y,loadOffset.Z));
1190 loadOffset.Z + ">");
1191 } 1196 }
1192 } 1197 }
1193 m_sceneManager.LoadCurrentSceneFromXml(cmdparams[0], generateNewIDS, loadOffset); 1198 m_sceneManager.LoadCurrentSceneFromXml(cmdparams[0], generateNewIDS, loadOffset);
@@ -1200,7 +1205,7 @@ namespace OpenSim
1200 } 1205 }
1201 catch (FileNotFoundException) 1206 catch (FileNotFoundException)
1202 { 1207 {
1203 m_log.Error("Default xml not found. Usage: load-xml <filename>"); 1208 MainConsole.Instance.Output("Default xml not found. Usage: load-xml <filename>");
1204 } 1209 }
1205 } 1210 }
1206 } 1211 }
@@ -1236,7 +1241,7 @@ namespace OpenSim
1236 } 1241 }
1237 catch (FileNotFoundException) 1242 catch (FileNotFoundException)
1238 { 1243 {
1239 m_log.Error("Specified xml not found. Usage: load xml2 <filename>"); 1244 MainConsole.Instance.Output("Specified xml not found. Usage: load xml2 <filename>");
1240 } 1245 }
1241 } 1246 }
1242 else 1247 else
@@ -1247,7 +1252,7 @@ namespace OpenSim
1247 } 1252 }
1248 catch (FileNotFoundException) 1253 catch (FileNotFoundException)
1249 { 1254 {
1250 m_log.Error("Default xml not found. Usage: load xml2 <filename>"); 1255 MainConsole.Instance.Output("Default xml not found. Usage: load xml2 <filename>");
1251 } 1256 }
1252 } 1257 }
1253 } 1258 }
@@ -1264,7 +1269,7 @@ namespace OpenSim
1264 } 1269 }
1265 catch (Exception e) 1270 catch (Exception e)
1266 { 1271 {
1267 m_log.Error(e.Message); 1272 MainConsole.Instance.Output(e.Message);
1268 } 1273 }
1269 } 1274 }
1270 1275
generated by cgit v1.1 at 2024-11-19 21:58:58 +0000