aboutsummaryrefslogtreecommitdiffstatshomepage
diff options
context:
space:
mode:
authoronefang2019-08-13 03:48:07 +1000
committeronefang2019-08-13 03:48:07 +1000
commit17bf8826dc09298c6fc6898ccb257af6967dead6 (patch)
tree62e3d9b75d184258e909d69fdf927910e1ca6f1f
parentThisSim.ini -> Actual_Name.ini (diff)
downloadopensim-SC-17bf8826dc09298c6fc6898ccb257af6967dead6.zip
opensim-SC-17bf8826dc09298c6fc6898ccb257af6967dead6.tar.gz
opensim-SC-17bf8826dc09298c6fc6898ccb257af6967dead6.tar.bz2
opensim-SC-17bf8826dc09298c6fc6898ccb257af6967dead6.tar.xz
Godliness can be in the first name as well.
As it is in IG.
-rw-r--r--OpenSim/Region/OptionalModules/ViewerSupport/GodNamesModule.cs14
-rw-r--r--bin/config-include/config_IG.ini1
2 files changed, 15 insertions, 0 deletions
diff --git a/OpenSim/Region/OptionalModules/ViewerSupport/GodNamesModule.cs b/OpenSim/Region/OptionalModules/ViewerSupport/GodNamesModule.cs
index 8ed0bb3..20650bf 100644
--- a/OpenSim/Region/OptionalModules/ViewerSupport/GodNamesModule.cs
+++ b/OpenSim/Region/OptionalModules/ViewerSupport/GodNamesModule.cs
@@ -47,6 +47,7 @@ namespace OpenSim.Region.OptionalModules.ViewerSupport
47 47
48 // Configuration 48 // Configuration
49 private static bool m_enabled = false; 49 private static bool m_enabled = false;
50 private static List<String> m_firstNames = new List<String>();
50 private static List<String> m_lastNames = new List<String>(); 51 private static List<String> m_lastNames = new List<String>();
51 private static List<String> m_fullNames = new List<String>(); 52 private static List<String> m_fullNames = new List<String>();
52 53
@@ -72,6 +73,13 @@ namespace OpenSim.Region.OptionalModules.ViewerSupport
72 m_fullNames.Add(strlan); 73 m_fullNames.Add(strlan);
73 } 74 }
74 75
76 conf_str = moduleConfig.GetString("FirstNames", String.Empty);
77 foreach (string strl in conf_str.Split(',')) {
78 string strlan = strl.Trim(" \t".ToCharArray());
79 m_log.DebugFormat("[GODNAMES]: Adding {0} as a God first name", strlan);
80 m_firstNames.Add(strlan);
81 }
82
75 conf_str = moduleConfig.GetString("Surnames", String.Empty); 83 conf_str = moduleConfig.GetString("Surnames", String.Empty);
76 foreach (string strl in conf_str.Split(',')) { 84 foreach (string strl in conf_str.Split(',')) {
77 string strlan = strl.Trim(" \t".ToCharArray()); 85 string strlan = strl.Trim(" \t".ToCharArray());
@@ -134,6 +142,12 @@ namespace OpenSim.Region.OptionalModules.ViewerSupport
134 } 142 }
135 ((OSDMap)namesmap)["full_names"] = fnames; 143 ((OSDMap)namesmap)["full_names"] = fnames;
136 144
145 OSDArray fsnames = new OSDArray();
146 foreach (string name in m_firstNames) {
147 fsnames.Add(name);
148 }
149 ((OSDMap)namesmap)["first_names"] = fsnames;
150
137 OSDArray lnames = new OSDArray(); 151 OSDArray lnames = new OSDArray();
138 foreach (string name in m_lastNames) { 152 foreach (string name in m_lastNames) {
139 lnames.Add(name); 153 lnames.Add(name);
diff --git a/bin/config-include/config_IG.ini b/bin/config-include/config_IG.ini
index 81c5c9d..186f728 100644
--- a/bin/config-include/config_IG.ini
+++ b/bin/config-include/config_IG.ini
@@ -72,6 +72,7 @@
72[GodNames] 72[GodNames]
73 Enabled = true 73 Enabled = true
74 FullNames = "Infinite BootsFang,Infinite Crush,infinite onefang,Infinite Riseon" 74 FullNames = "Infinite BootsFang,Infinite Crush,infinite onefang,Infinite Riseon"
75 FirstNames = "Infinite,infinite"
75; Surnames = "Kryztlsk" 76; Surnames = "Kryztlsk"
76 77
77[GridService] 78[GridService]