diff options
author | onefang | 2019-09-11 16:36:50 +1000 |
---|---|---|
committer | onefang | 2019-09-11 16:36:50 +1000 |
commit | 50cd1ffd32f69228e566f2b0b89f86ea0d9fe489 (patch) | |
tree | 52f2ab0c04f1a5d7d6ac5dc872981b4b156447e7 /OpenSim/Region/OptionalModules/ViewerSupport/GodNamesModule.cs | |
parent | Renamed branch to SledjChisl. (diff) | |
parent | Bump to release flavour, build 0. (diff) | |
download | opensim-SC_OLD-50cd1ffd32f69228e566f2b0b89f86ea0d9fe489.zip opensim-SC_OLD-50cd1ffd32f69228e566f2b0b89f86ea0d9fe489.tar.gz opensim-SC_OLD-50cd1ffd32f69228e566f2b0b89f86ea0d9fe489.tar.bz2 opensim-SC_OLD-50cd1ffd32f69228e566f2b0b89f86ea0d9fe489.tar.xz |
Merge branch 'SledjChisl'
Diffstat (limited to '')
-rw-r--r-- | OpenSim/Region/OptionalModules/ViewerSupport/GodNamesModule.cs | 18 |
1 files changed, 16 insertions, 2 deletions
diff --git a/OpenSim/Region/OptionalModules/ViewerSupport/GodNamesModule.cs b/OpenSim/Region/OptionalModules/ViewerSupport/GodNamesModule.cs index e0537a4..20650bf 100644 --- a/OpenSim/Region/OptionalModules/ViewerSupport/GodNamesModule.cs +++ b/OpenSim/Region/OptionalModules/ViewerSupport/GodNamesModule.cs | |||
@@ -47,10 +47,11 @@ 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 | ||
53 | public void Initialise(IConfigSource config) | 54 | public void Initialise(IConfigSource config) |
54 | { | 55 | { |
55 | IConfig moduleConfig = config.Configs["GodNames"]; | 56 | IConfig moduleConfig = config.Configs["GodNames"]; |
56 | 57 | ||
@@ -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()); |
@@ -133,7 +141,13 @@ namespace OpenSim.Region.OptionalModules.ViewerSupport | |||
133 | fnames.Add(name); | 141 | fnames.Add(name); |
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); |