From 141c5e437b45e6f59b5556ad4d9f36b869a8790c Mon Sep 17 00:00:00 2001
From: onefang
Date: Fri, 11 Sep 2020 01:04:26 +1000
Subject: Godliness can be in the first name as well.

---
 .../ViewerSupport/GodNamesModule.cs                | 26 +++++++++++++++++++---
 1 file changed, 23 insertions(+), 3 deletions(-)

(limited to 'OpenSim')

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
 
         // Configuration
         private static bool m_enabled = false;
+        private static List<String> m_firstNames = new List<String>();
         private static List<String> m_lastNames = new List<String>();
         private static List<String> m_fullNames = new List<String>();
 
@@ -68,17 +69,30 @@ namespace OpenSim.Region.OptionalModules.ViewerSupport
             string conf_str = moduleConfig.GetString("FullNames", String.Empty);
             if (conf_str != String.Empty)
             {
-                foreach (string strl in conf_str.Split(',')) {
+                foreach (string strl in conf_str.Split(',')) 
+		{
                     string strlan = strl.Trim(" \t".ToCharArray());
                     m_log.DebugFormat("[GODNAMES]: Adding {0} as a God name", strlan);
                     m_fullNames.Add(strlan);
                 }
             }
 
-            conf_str = moduleConfig.GetString("Surnames", String.Empty);
             if (conf_str != String.Empty)
             {
-                foreach (string strl in conf_str.Split(',')) {
+                conf_str = moduleConfig.GetString("FirstNames", String.Empty);
+                foreach (string strl in conf_str.Split(','))
+	        {
+                    string strlan = strl.Trim(" \t".ToCharArray());
+                    m_log.DebugFormat("[GODNAMES]: Adding {0} as a God first name", strlan);
+                    m_firstNames.Add(strlan);
+                }
+            }
+
+            if (conf_str != String.Empty)
+            {
+                conf_str = moduleConfig.GetString("Surnames", String.Empty);
+                foreach (string strl in conf_str.Split(','))
+                {
                     string strlan = strl.Trim(" \t".ToCharArray());
                     m_log.DebugFormat("[GODNAMES]: Adding {0} as a God last name", strlan);
                     m_lastNames.Add(strlan);
@@ -140,6 +154,12 @@ namespace OpenSim.Region.OptionalModules.ViewerSupport
             }
             ((OSDMap)namesmap)["full_names"] = fnames;
 
+            OSDArray fsnames = new OSDArray();
+            foreach (string name in m_firstNames) {
+                fsnames.Add(name);
+            }
+            ((OSDMap)namesmap)["first_names"] = fsnames;
+
             OSDArray lnames = new OSDArray();
             foreach (string name in m_lastNames) {
                 lnames.Add(name);
-- 
cgit v1.1