diff options
author | UbitUmarov | 2019-10-22 13:04:01 +0100 |
---|---|---|
committer | UbitUmarov | 2019-10-22 13:04:01 +0100 |
commit | 46e36601cb3c54e6e441284aed7c0c5c35970a4c (patch) | |
tree | bf52486c1e8edaae327d7d93ea3ae6e6fd48a61d /OpenSim/Services/GridService/GridService.cs | |
parent | remove some more useless NULL arguments (diff) | |
download | opensim-SC-46e36601cb3c54e6e441284aed7c0c5c35970a4c.zip opensim-SC-46e36601cb3c54e6e441284aed7c0c5c35970a4c.tar.gz opensim-SC-46e36601cb3c54e6e441284aed7c0c5c35970a4c.tar.bz2 opensim-SC-46e36601cb3c54e6e441284aed7c0c5c35970a4c.tar.xz |
remove some more useless NULL arguments
Diffstat (limited to 'OpenSim/Services/GridService/GridService.cs')
-rwxr-xr-x | OpenSim/Services/GridService/GridService.cs | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/OpenSim/Services/GridService/GridService.cs b/OpenSim/Services/GridService/GridService.cs index 3c961fe..40893a9 100755 --- a/OpenSim/Services/GridService/GridService.cs +++ b/OpenSim/Services/GridService/GridService.cs | |||
@@ -787,7 +787,7 @@ namespace OpenSim.Services.GridService | |||
787 | 787 | ||
788 | if (!UUID.TryParse(rawRegionUuid, out regionUuid)) | 788 | if (!UUID.TryParse(rawRegionUuid, out regionUuid)) |
789 | { | 789 | { |
790 | MainConsole.Instance.Output("{0} is not a valid region uuid", null, rawRegionUuid); | 790 | MainConsole.Instance.Output("{0} is not a valid region uuid", rawRegionUuid); |
791 | return; | 791 | return; |
792 | } | 792 | } |
793 | 793 | ||
@@ -795,18 +795,18 @@ namespace OpenSim.Services.GridService | |||
795 | 795 | ||
796 | if (region == null) | 796 | if (region == null) |
797 | { | 797 | { |
798 | MainConsole.Instance.Output("No region with UUID {0}", null, regionUuid); | 798 | MainConsole.Instance.Output("No region with UUID {0}", regionUuid); |
799 | return; | 799 | return; |
800 | } | 800 | } |
801 | 801 | ||
802 | if (DeregisterRegion(regionUuid)) | 802 | if (DeregisterRegion(regionUuid)) |
803 | { | 803 | { |
804 | MainConsole.Instance.Output("Deregistered {0} {1}", null, region.RegionName, regionUuid); | 804 | MainConsole.Instance.Output("Deregistered {0} {1}", region.RegionName, regionUuid); |
805 | } | 805 | } |
806 | else | 806 | else |
807 | { | 807 | { |
808 | // I don't think this can ever occur if we know that the region exists. | 808 | // I don't think this can ever occur if we know that the region exists. |
809 | MainConsole.Instance.Output("Error deregistering {0} {1}", null, region.RegionName, regionUuid); | 809 | MainConsole.Instance.Output("Error deregistering {0} {1}", region.RegionName, regionUuid); |
810 | } | 810 | } |
811 | } | 811 | } |
812 | } | 812 | } |
@@ -843,7 +843,7 @@ namespace OpenSim.Services.GridService | |||
843 | MainConsole.Instance.Output("it will count regions that are inactive but were not deregistered from the grid service"); | 843 | MainConsole.Instance.Output("it will count regions that are inactive but were not deregistered from the grid service"); |
844 | MainConsole.Instance.Output("(e.g. simulator crashed rather than shutting down cleanly).\n"); | 844 | MainConsole.Instance.Output("(e.g. simulator crashed rather than shutting down cleanly).\n"); |
845 | 845 | ||
846 | MainConsole.Instance.Output("Grid size: {0} km squared.", null, size / 1000000); | 846 | MainConsole.Instance.Output("Grid size: {0} km squared.", size / 1000000); |
847 | } | 847 | } |
848 | 848 | ||
849 | private void HandleShowRegion(string module, string[] cmd) | 849 | private void HandleShowRegion(string module, string[] cmd) |
@@ -892,7 +892,7 @@ namespace OpenSim.Services.GridService | |||
892 | 892 | ||
893 | if (region == null) | 893 | if (region == null) |
894 | { | 894 | { |
895 | MainConsole.Instance.Output("No region found at {0},{1}", null, x, y); | 895 | MainConsole.Instance.Output("No region found at {0},{1}", x, y); |
896 | return; | 896 | return; |
897 | } | 897 | } |
898 | 898 | ||