diff options
author | Adam Frisby | 2008-01-15 02:09:55 +0000 |
---|---|---|
committer | Adam Frisby | 2008-01-15 02:09:55 +0000 |
commit | b25f9f322cdbcde7fd8c043137bf07992e5ef318 (patch) | |
tree | 7c1a5115b2849dfe388b825dd271271d347f9574 /OpenSim/Framework/EstateSettings.cs | |
parent | Set svn:eol-style. (diff) | |
download | opensim-SC-b25f9f322cdbcde7fd8c043137bf07992e5ef318.zip opensim-SC-b25f9f322cdbcde7fd8c043137bf07992e5ef318.tar.gz opensim-SC-b25f9f322cdbcde7fd8c043137bf07992e5ef318.tar.bz2 opensim-SC-b25f9f322cdbcde7fd8c043137bf07992e5ef318.tar.xz |
* Mother of all commits:
* Cleaned up copyright notices in AssemblyInfo.cs's
* Added Copyright headers to a bunch of files missing them
* Replaced several common string instances with a static constant to prevent reallocation of the same strings thousands of times. "" -> String.Empty is the first such candidate.
Diffstat (limited to '')
-rw-r--r-- | OpenSim/Framework/EstateSettings.cs | 92 |
1 files changed, 46 insertions, 46 deletions
diff --git a/OpenSim/Framework/EstateSettings.cs b/OpenSim/Framework/EstateSettings.cs index b2bd181..b5a3468 100644 --- a/OpenSim/Framework/EstateSettings.cs +++ b/OpenSim/Framework/EstateSettings.cs | |||
@@ -756,106 +756,106 @@ namespace OpenSim.Framework | |||
756 | 756 | ||
757 | public void loadConfigurationOptions() | 757 | public void loadConfigurationOptions() |
758 | { | 758 | { |
759 | configMember.addConfigurationOption("billable_factor", ConfigurationOption.ConfigurationTypes.TYPE_FLOAT, "", | 759 | configMember.addConfigurationOption("billable_factor", ConfigurationOption.ConfigurationTypes.TYPE_FLOAT, String.Empty, |
760 | "0.0", true); | 760 | "0.0", true); |
761 | configMember.addConfigurationOption("estate_id", ConfigurationOption.ConfigurationTypes.TYPE_UINT32, "", "0", | 761 | configMember.addConfigurationOption("estate_id", ConfigurationOption.ConfigurationTypes.TYPE_UINT32, String.Empty, "0", |
762 | true); | 762 | true); |
763 | configMember.addConfigurationOption("parent_estate_id", ConfigurationOption.ConfigurationTypes.TYPE_UINT32, | 763 | configMember.addConfigurationOption("parent_estate_id", ConfigurationOption.ConfigurationTypes.TYPE_UINT32, |
764 | "", "0", true); | 764 | String.Empty, "0", true); |
765 | configMember.addConfigurationOption("max_agents", ConfigurationOption.ConfigurationTypes.TYPE_BYTE, "", "40", | 765 | configMember.addConfigurationOption("max_agents", ConfigurationOption.ConfigurationTypes.TYPE_BYTE, String.Empty, "40", |
766 | true); | 766 | true); |
767 | 767 | ||
768 | configMember.addConfigurationOption("object_bonus_factor", ConfigurationOption.ConfigurationTypes.TYPE_FLOAT, | 768 | configMember.addConfigurationOption("object_bonus_factor", ConfigurationOption.ConfigurationTypes.TYPE_FLOAT, |
769 | "", "1.0", true); | 769 | String.Empty, "1.0", true); |
770 | configMember.addConfigurationOption("redirect_grid_x", ConfigurationOption.ConfigurationTypes.TYPE_INT32, "", | 770 | configMember.addConfigurationOption("redirect_grid_x", ConfigurationOption.ConfigurationTypes.TYPE_INT32, String.Empty, |
771 | "0", true); | 771 | "0", true); |
772 | configMember.addConfigurationOption("redirect_grid_y", ConfigurationOption.ConfigurationTypes.TYPE_INT32, "", | 772 | configMember.addConfigurationOption("redirect_grid_y", ConfigurationOption.ConfigurationTypes.TYPE_INT32, String.Empty, |
773 | "0", true); | 773 | "0", true); |
774 | configMember.addConfigurationOption("region_flags", ConfigurationOption.ConfigurationTypes.TYPE_UINT32, "", | 774 | configMember.addConfigurationOption("region_flags", ConfigurationOption.ConfigurationTypes.TYPE_UINT32, String.Empty, |
775 | "0", true); | 775 | "0", true); |
776 | configMember.addConfigurationOption("sim_access", ConfigurationOption.ConfigurationTypes.TYPE_BYTE, "", "21", | 776 | configMember.addConfigurationOption("sim_access", ConfigurationOption.ConfigurationTypes.TYPE_BYTE, String.Empty, "21", |
777 | true); | 777 | true); |
778 | configMember.addConfigurationOption("sun_hour", ConfigurationOption.ConfigurationTypes.TYPE_FLOAT, "", "0", | 778 | configMember.addConfigurationOption("sun_hour", ConfigurationOption.ConfigurationTypes.TYPE_FLOAT, String.Empty, "0", |
779 | true); | 779 | true); |
780 | configMember.addConfigurationOption("terrain_raise_limit", ConfigurationOption.ConfigurationTypes.TYPE_FLOAT, | 780 | configMember.addConfigurationOption("terrain_raise_limit", ConfigurationOption.ConfigurationTypes.TYPE_FLOAT, |
781 | "", "0", true); | 781 | String.Empty, "0", true); |
782 | configMember.addConfigurationOption("terrain_lower_limit", ConfigurationOption.ConfigurationTypes.TYPE_FLOAT, | 782 | configMember.addConfigurationOption("terrain_lower_limit", ConfigurationOption.ConfigurationTypes.TYPE_FLOAT, |
783 | "", "0", true); | 783 | String.Empty, "0", true); |
784 | configMember.addConfigurationOption("use_fixed_sun", ConfigurationOption.ConfigurationTypes.TYPE_BOOLEAN, "", | 784 | configMember.addConfigurationOption("use_fixed_sun", ConfigurationOption.ConfigurationTypes.TYPE_BOOLEAN, String.Empty, |
785 | "false", true); | 785 | "false", true); |
786 | configMember.addConfigurationOption("price_per_meter", ConfigurationOption.ConfigurationTypes.TYPE_UINT32, | 786 | configMember.addConfigurationOption("price_per_meter", ConfigurationOption.ConfigurationTypes.TYPE_UINT32, |
787 | "", "1", true); | 787 | String.Empty, "1", true); |
788 | configMember.addConfigurationOption("region_water_height", | 788 | configMember.addConfigurationOption("region_water_height", |
789 | ConfigurationOption.ConfigurationTypes.TYPE_UINT16, "", "20", true); | 789 | ConfigurationOption.ConfigurationTypes.TYPE_UINT16, String.Empty, "20", true); |
790 | configMember.addConfigurationOption("region_allow_terraform", | 790 | configMember.addConfigurationOption("region_allow_terraform", |
791 | ConfigurationOption.ConfigurationTypes.TYPE_BOOLEAN, "", "true", true); | 791 | ConfigurationOption.ConfigurationTypes.TYPE_BOOLEAN, String.Empty, "true", true); |
792 | 792 | ||
793 | configMember.addConfigurationOption("terrain_base_0", ConfigurationOption.ConfigurationTypes.TYPE_LLUUID, "", | 793 | configMember.addConfigurationOption("terrain_base_0", ConfigurationOption.ConfigurationTypes.TYPE_LLUUID, String.Empty, |
794 | "b8d3965a-ad78-bf43-699b-bff8eca6c975", true); | 794 | "b8d3965a-ad78-bf43-699b-bff8eca6c975", true); |
795 | configMember.addConfigurationOption("terrain_base_1", ConfigurationOption.ConfigurationTypes.TYPE_LLUUID, "", | 795 | configMember.addConfigurationOption("terrain_base_1", ConfigurationOption.ConfigurationTypes.TYPE_LLUUID, String.Empty, |
796 | "abb783e6-3e93-26c0-248a-247666855da3", true); | 796 | "abb783e6-3e93-26c0-248a-247666855da3", true); |
797 | configMember.addConfigurationOption("terrain_base_2", ConfigurationOption.ConfigurationTypes.TYPE_LLUUID, "", | 797 | configMember.addConfigurationOption("terrain_base_2", ConfigurationOption.ConfigurationTypes.TYPE_LLUUID, String.Empty, |
798 | "179cdabd-398a-9b6b-1391-4dc333ba321f", true); | 798 | "179cdabd-398a-9b6b-1391-4dc333ba321f", true); |
799 | configMember.addConfigurationOption("terrain_base_3", ConfigurationOption.ConfigurationTypes.TYPE_LLUUID, "", | 799 | configMember.addConfigurationOption("terrain_base_3", ConfigurationOption.ConfigurationTypes.TYPE_LLUUID, String.Empty, |
800 | "beb169c7-11ea-fff2-efe5-0f24dc881df2", true); | 800 | "beb169c7-11ea-fff2-efe5-0f24dc881df2", true); |
801 | 801 | ||
802 | configMember.addConfigurationOption("terrain_detail_0", ConfigurationOption.ConfigurationTypes.TYPE_LLUUID, | 802 | configMember.addConfigurationOption("terrain_detail_0", ConfigurationOption.ConfigurationTypes.TYPE_LLUUID, |
803 | "", "00000000-0000-0000-0000-000000000000", true); | 803 | String.Empty, "00000000-0000-0000-0000-000000000000", true); |
804 | configMember.addConfigurationOption("terrain_detail_1", ConfigurationOption.ConfigurationTypes.TYPE_LLUUID, | 804 | configMember.addConfigurationOption("terrain_detail_1", ConfigurationOption.ConfigurationTypes.TYPE_LLUUID, |
805 | "", "00000000-0000-0000-0000-000000000000", true); | 805 | String.Empty, "00000000-0000-0000-0000-000000000000", true); |
806 | configMember.addConfigurationOption("terrain_detail_2", ConfigurationOption.ConfigurationTypes.TYPE_LLUUID, | 806 | configMember.addConfigurationOption("terrain_detail_2", ConfigurationOption.ConfigurationTypes.TYPE_LLUUID, |
807 | "", "00000000-0000-0000-0000-000000000000", true); | 807 | String.Empty, "00000000-0000-0000-0000-000000000000", true); |
808 | configMember.addConfigurationOption("terrain_detail_3", ConfigurationOption.ConfigurationTypes.TYPE_LLUUID, | 808 | configMember.addConfigurationOption("terrain_detail_3", ConfigurationOption.ConfigurationTypes.TYPE_LLUUID, |
809 | "", "00000000-0000-0000-0000-000000000000", true); | 809 | String.Empty, "00000000-0000-0000-0000-000000000000", true); |
810 | 810 | ||
811 | configMember.addConfigurationOption("terrain_start_height_0", | 811 | configMember.addConfigurationOption("terrain_start_height_0", |
812 | ConfigurationOption.ConfigurationTypes.TYPE_FLOAT, "", "10.0", true); | 812 | ConfigurationOption.ConfigurationTypes.TYPE_FLOAT, String.Empty, "10.0", true); |
813 | configMember.addConfigurationOption("terrain_start_height_1", | 813 | configMember.addConfigurationOption("terrain_start_height_1", |
814 | ConfigurationOption.ConfigurationTypes.TYPE_FLOAT, "", "10.0", true); | 814 | ConfigurationOption.ConfigurationTypes.TYPE_FLOAT, String.Empty, "10.0", true); |
815 | configMember.addConfigurationOption("terrain_start_height_2", | 815 | configMember.addConfigurationOption("terrain_start_height_2", |
816 | ConfigurationOption.ConfigurationTypes.TYPE_FLOAT, "", "10.0", true); | 816 | ConfigurationOption.ConfigurationTypes.TYPE_FLOAT, String.Empty, "10.0", true); |
817 | configMember.addConfigurationOption("terrain_start_height_3", | 817 | configMember.addConfigurationOption("terrain_start_height_3", |
818 | ConfigurationOption.ConfigurationTypes.TYPE_FLOAT, "", "10.0", true); | 818 | ConfigurationOption.ConfigurationTypes.TYPE_FLOAT, String.Empty, "10.0", true); |
819 | 819 | ||
820 | configMember.addConfigurationOption("terrain_height_range_0", | 820 | configMember.addConfigurationOption("terrain_height_range_0", |
821 | ConfigurationOption.ConfigurationTypes.TYPE_FLOAT, "", "60.0", true); | 821 | ConfigurationOption.ConfigurationTypes.TYPE_FLOAT, String.Empty, "60.0", true); |
822 | configMember.addConfigurationOption("terrain_height_range_1", | 822 | configMember.addConfigurationOption("terrain_height_range_1", |
823 | ConfigurationOption.ConfigurationTypes.TYPE_FLOAT, "", "60.0", true); | 823 | ConfigurationOption.ConfigurationTypes.TYPE_FLOAT, String.Empty, "60.0", true); |
824 | configMember.addConfigurationOption("terrain_height_range_2", | 824 | configMember.addConfigurationOption("terrain_height_range_2", |
825 | ConfigurationOption.ConfigurationTypes.TYPE_FLOAT, "", "60.0", true); | 825 | ConfigurationOption.ConfigurationTypes.TYPE_FLOAT, String.Empty, "60.0", true); |
826 | configMember.addConfigurationOption("terrain_height_range_3", | 826 | configMember.addConfigurationOption("terrain_height_range_3", |
827 | ConfigurationOption.ConfigurationTypes.TYPE_FLOAT, "", "60.0", true); | 827 | ConfigurationOption.ConfigurationTypes.TYPE_FLOAT, String.Empty, "60.0", true); |
828 | 828 | ||
829 | configMember.addConfigurationOption("terrain_file", | 829 | configMember.addConfigurationOption("terrain_file", |
830 | ConfigurationOption.ConfigurationTypes.TYPE_STRING_NOT_EMPTY, "", | 830 | ConfigurationOption.ConfigurationTypes.TYPE_STRING_NOT_EMPTY, String.Empty, |
831 | "default.r32", true); | 831 | "default.r32", true); |
832 | configMember.addConfigurationOption("terrain_multiplier", ConfigurationOption.ConfigurationTypes.TYPE_FLOAT, | 832 | configMember.addConfigurationOption("terrain_multiplier", ConfigurationOption.ConfigurationTypes.TYPE_FLOAT, |
833 | "", "60.0", true); | 833 | String.Empty, "60.0", true); |
834 | configMember.addConfigurationOption("water_height", ConfigurationOption.ConfigurationTypes.TYPE_DOUBLE, "", | 834 | configMember.addConfigurationOption("water_height", ConfigurationOption.ConfigurationTypes.TYPE_DOUBLE, String.Empty, |
835 | "20.0", true); | 835 | "20.0", true); |
836 | configMember.addConfigurationOption("terrain_image_id", ConfigurationOption.ConfigurationTypes.TYPE_LLUUID, | 836 | configMember.addConfigurationOption("terrain_image_id", ConfigurationOption.ConfigurationTypes.TYPE_LLUUID, |
837 | "", "00000000-0000-0000-0000-000000000000", true); | 837 | String.Empty, "00000000-0000-0000-0000-000000000000", true); |
838 | 838 | ||
839 | configMember.addConfigurationOption("estate_manager_0", ConfigurationOption.ConfigurationTypes.TYPE_LLUUID, | 839 | configMember.addConfigurationOption("estate_manager_0", ConfigurationOption.ConfigurationTypes.TYPE_LLUUID, |
840 | "", "00000000-0000-0000-0000-000000000000", true); | 840 | String.Empty, "00000000-0000-0000-0000-000000000000", true); |
841 | configMember.addConfigurationOption("estate_manager_1", ConfigurationOption.ConfigurationTypes.TYPE_LLUUID, | 841 | configMember.addConfigurationOption("estate_manager_1", ConfigurationOption.ConfigurationTypes.TYPE_LLUUID, |
842 | "", "00000000-0000-0000-0000-000000000000", true); | 842 | String.Empty, "00000000-0000-0000-0000-000000000000", true); |
843 | configMember.addConfigurationOption("estate_manager_2", ConfigurationOption.ConfigurationTypes.TYPE_LLUUID, | 843 | configMember.addConfigurationOption("estate_manager_2", ConfigurationOption.ConfigurationTypes.TYPE_LLUUID, |
844 | "", "00000000-0000-0000-0000-000000000000", true); | 844 | String.Empty, "00000000-0000-0000-0000-000000000000", true); |
845 | configMember.addConfigurationOption("estate_manager_3", ConfigurationOption.ConfigurationTypes.TYPE_LLUUID, | 845 | configMember.addConfigurationOption("estate_manager_3", ConfigurationOption.ConfigurationTypes.TYPE_LLUUID, |
846 | "", "00000000-0000-0000-0000-000000000000", true); | 846 | String.Empty, "00000000-0000-0000-0000-000000000000", true); |
847 | configMember.addConfigurationOption("estate_manager_4", ConfigurationOption.ConfigurationTypes.TYPE_LLUUID, | 847 | configMember.addConfigurationOption("estate_manager_4", ConfigurationOption.ConfigurationTypes.TYPE_LLUUID, |
848 | "", "00000000-0000-0000-0000-000000000000", true); | 848 | String.Empty, "00000000-0000-0000-0000-000000000000", true); |
849 | configMember.addConfigurationOption("estate_manager_5", ConfigurationOption.ConfigurationTypes.TYPE_LLUUID, | 849 | configMember.addConfigurationOption("estate_manager_5", ConfigurationOption.ConfigurationTypes.TYPE_LLUUID, |
850 | "", "00000000-0000-0000-0000-000000000000", true); | 850 | String.Empty, "00000000-0000-0000-0000-000000000000", true); |
851 | configMember.addConfigurationOption("estate_manager_6", ConfigurationOption.ConfigurationTypes.TYPE_LLUUID, | 851 | configMember.addConfigurationOption("estate_manager_6", ConfigurationOption.ConfigurationTypes.TYPE_LLUUID, |
852 | "", "00000000-0000-0000-0000-000000000000", true); | 852 | String.Empty, "00000000-0000-0000-0000-000000000000", true); |
853 | configMember.addConfigurationOption("estate_manager_7", ConfigurationOption.ConfigurationTypes.TYPE_LLUUID, | 853 | configMember.addConfigurationOption("estate_manager_7", ConfigurationOption.ConfigurationTypes.TYPE_LLUUID, |
854 | "", "00000000-0000-0000-0000-000000000000", true); | 854 | String.Empty, "00000000-0000-0000-0000-000000000000", true); |
855 | configMember.addConfigurationOption("estate_manager_8", ConfigurationOption.ConfigurationTypes.TYPE_LLUUID, | 855 | configMember.addConfigurationOption("estate_manager_8", ConfigurationOption.ConfigurationTypes.TYPE_LLUUID, |
856 | "", "00000000-0000-0000-0000-000000000000", true); | 856 | String.Empty, "00000000-0000-0000-0000-000000000000", true); |
857 | configMember.addConfigurationOption("estate_manager_9", ConfigurationOption.ConfigurationTypes.TYPE_LLUUID, | 857 | configMember.addConfigurationOption("estate_manager_9", ConfigurationOption.ConfigurationTypes.TYPE_LLUUID, |
858 | "", "00000000-0000-0000-0000-000000000000", true); | 858 | String.Empty, "00000000-0000-0000-0000-000000000000", true); |
859 | 859 | ||
860 | } | 860 | } |
861 | 861 | ||