From 34209d2a397ddc0be99ff314a89c2a4b10e47d7c Mon Sep 17 00:00:00 2001
From: Melanie
Date: Sat, 27 Jul 2019 12:12:35 +0100
Subject: Fix godnames module to not add the empty string if only one option is
 used

---
 .../ViewerSupport/GodNamesModule.cs                | 22 ++++++++++++++--------
 1 file changed, 14 insertions(+), 8 deletions(-)

diff --git a/OpenSim/Region/OptionalModules/ViewerSupport/GodNamesModule.cs b/OpenSim/Region/OptionalModules/ViewerSupport/GodNamesModule.cs
index 8ed0bb3..b2dc2e1 100644
--- a/OpenSim/Region/OptionalModules/ViewerSupport/GodNamesModule.cs
+++ b/OpenSim/Region/OptionalModules/ViewerSupport/GodNamesModule.cs
@@ -66,17 +66,23 @@ namespace OpenSim.Region.OptionalModules.ViewerSupport
             m_log.Info("[GODNAMES]: Enabled");
             m_enabled = true;
             string conf_str = moduleConfig.GetString("FullNames", String.Empty);
-            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);
+            if (conf_str != String.Empty)
+            {
+                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);
-            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);
+            if (conf_str != 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);
+                }
             }
         }
 
-- 
cgit v1.1