diff options
author | onefang | 2020-09-11 01:04:26 +1000 |
---|---|---|
committer | onefang | 2020-09-11 01:04:26 +1000 |
commit | 141c5e437b45e6f59b5556ad4d9f36b869a8790c (patch) | |
tree | 1b04b845b7fc6edc1c8c00b9f2102e34982999f1 /OpenSim/Region | |
parent | Automatically add members to certain groups, and HGers from specific grids to... (diff) | |
download | opensim-SC-141c5e437b45e6f59b5556ad4d9f36b869a8790c.zip opensim-SC-141c5e437b45e6f59b5556ad4d9f36b869a8790c.tar.gz opensim-SC-141c5e437b45e6f59b5556ad4d9f36b869a8790c.tar.bz2 opensim-SC-141c5e437b45e6f59b5556ad4d9f36b869a8790c.tar.xz |
Godliness can be in the first name as well.
Diffstat (limited to 'OpenSim/Region')
-rw-r--r-- | OpenSim/Region/OptionalModules/ViewerSupport/GodNamesModule.cs | 26 |
1 files changed, 23 insertions, 3 deletions
diff --git a/OpenSim/Region/OptionalModules/ViewerSupport/GodNamesModule.cs b/OpenSim/Region/OptionalModules/ViewerSupport/GodNamesModule.cs index b2dc2e1..d61d079 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 | ||
@@ -68,17 +69,30 @@ namespace OpenSim.Region.OptionalModules.ViewerSupport | |||
68 | string conf_str = moduleConfig.GetString("FullNames", String.Empty); | 69 | string conf_str = moduleConfig.GetString("FullNames", String.Empty); |
69 | if (conf_str != String.Empty) | 70 | if (conf_str != String.Empty) |
70 | { | 71 | { |
71 | foreach (string strl in conf_str.Split(',')) { | 72 | foreach (string strl in conf_str.Split(',')) |
73 | { | ||
72 | string strlan = strl.Trim(" \t".ToCharArray()); | 74 | string strlan = strl.Trim(" \t".ToCharArray()); |
73 | m_log.DebugFormat("[GODNAMES]: Adding {0} as a God name", strlan); | 75 | m_log.DebugFormat("[GODNAMES]: Adding {0} as a God name", strlan); |
74 | m_fullNames.Add(strlan); | 76 | m_fullNames.Add(strlan); |
75 | } | 77 | } |
76 | } | 78 | } |
77 | 79 | ||
78 | conf_str = moduleConfig.GetString("Surnames", String.Empty); | ||
79 | if (conf_str != String.Empty) | 80 | if (conf_str != String.Empty) |
80 | { | 81 | { |
81 | foreach (string strl in conf_str.Split(',')) { | 82 | conf_str = moduleConfig.GetString("FirstNames", String.Empty); |
83 | foreach (string strl in conf_str.Split(',')) | ||
84 | { | ||
85 | string strlan = strl.Trim(" \t".ToCharArray()); | ||
86 | m_log.DebugFormat("[GODNAMES]: Adding {0} as a God first name", strlan); | ||
87 | m_firstNames.Add(strlan); | ||
88 | } | ||
89 | } | ||
90 | |||
91 | if (conf_str != String.Empty) | ||
92 | { | ||
93 | conf_str = moduleConfig.GetString("Surnames", String.Empty); | ||
94 | foreach (string strl in conf_str.Split(',')) | ||
95 | { | ||
82 | string strlan = strl.Trim(" \t".ToCharArray()); | 96 | string strlan = strl.Trim(" \t".ToCharArray()); |
83 | m_log.DebugFormat("[GODNAMES]: Adding {0} as a God last name", strlan); | 97 | m_log.DebugFormat("[GODNAMES]: Adding {0} as a God last name", strlan); |
84 | m_lastNames.Add(strlan); | 98 | m_lastNames.Add(strlan); |
@@ -140,6 +154,12 @@ namespace OpenSim.Region.OptionalModules.ViewerSupport | |||
140 | } | 154 | } |
141 | ((OSDMap)namesmap)["full_names"] = fnames; | 155 | ((OSDMap)namesmap)["full_names"] = fnames; |
142 | 156 | ||
157 | OSDArray fsnames = new OSDArray(); | ||
158 | foreach (string name in m_firstNames) { | ||
159 | fsnames.Add(name); | ||
160 | } | ||
161 | ((OSDMap)namesmap)["first_names"] = fsnames; | ||
162 | |||
143 | OSDArray lnames = new OSDArray(); | 163 | OSDArray lnames = new OSDArray(); |
144 | foreach (string name in m_lastNames) { | 164 | foreach (string name in m_lastNames) { |
145 | lnames.Add(name); | 165 | lnames.Add(name); |