--- LLLoginService.cs.ori	2019-02-07 00:16:35.002634582 +0100
+++ LLLoginService.cs	2019-02-07 00:15:54.311182052 +0100
@@ -285,11 +285,40 @@
 
             string processedMessage;
 
-            if (clientVersion.Contains("Radegast"))
+            // Returns the name of the user's viewer.
+            // This method handles two ways that viewers specify their name:
+            // 1. Viewer = "Firestorm-Release 4.4.2.34167", Channel = "(don't care)" -> "Firestorm-Release 4.4.2.34167"
+            // 2. Viewer = "4.5.1.38838", Channel = "Firestorm-Beta" -> "Firestorm-Beta 4.5.1.38838"
+            // The same for Hypergrid at GatekeeperService.cs and Util.cs
+
+            string name = clientVersion;
+            if (name == null)
+                name = "";
+            else
+                name = name.Trim();
+            // Check if 'clientVersion' is just a version number. If it's *not*, then we
+            // assume that it contains the real viewer name, and we return it.
+            bool is_viewer_name = false;
+            foreach (char c in name)
+            {
+                if (Char.IsLetter(c))
+                    is_viewer_name = true;
+                    break;
+            }
+
+            if (is_viewer_name == false)
+            {
+            	// The 'clientVersion' string contains just a version number. If there's anything in
+            	// 'channel' then assume that it's the viewer name.
+            	if ((channel != "") && (channel.Length > 0))
+                	name = channel.Trim() + " " + name;
+            }
+
+            if (name.Contains("Radegast"))
                 LibOMVclient = false;
 
             m_log.InfoFormat("[LLOGIN SERVICE]: Login request for {0} {1} at {2} using viewer {3}, channel {4}, IP {5}, Mac {6}, Id0 {7}, Possible LibOMVGridProxy: {8} ",
-                firstName, lastName, startLocation, clientVersion, channel, clientIP.Address.ToString(), mac, id0, LibOMVclient.ToString());
+                firstName, lastName, startLocation, name, channel, clientIP.Address.ToString(), mac, id0, LibOMVclient.ToString());
 
             try
             {
@@ -299,13 +328,14 @@
                 if (m_AllowedClients != string.Empty)
                 {
                     Regex arx = new Regex(m_AllowedClients);
-                    Match am = arx.Match(clientVersion);
+                    //Match am = arx.Match(clientVersion);
+                    Match am = arx.Match(name);
 
                     if (!am.Success)
                     {
-                        m_log.InfoFormat(
+                       m_log.InfoFormat(
                             "[LLOGIN SERVICE]: Login failed for {0} {1}, reason: client {2} is not allowed",
-                            firstName, lastName, clientVersion);
+                            firstName, lastName, name);                       
                         return LLFailedLoginResponse.LoginBlockedProblem;
                     }
                 }
@@ -313,13 +343,12 @@
                 if (m_DeniedClients != string.Empty)
                 {
                     Regex drx = new Regex(m_DeniedClients);
-                    Match dm = drx.Match(clientVersion);
-
+                    Match dm = drx.Match(name);
                     if (dm.Success)
                     {
-                        m_log.InfoFormat(
+                       m_log.InfoFormat(
                             "[LLOGIN SERVICE]: Login failed for {0} {1}, reason: client {2} is denied",
-                            firstName, lastName, clientVersion);
+                            firstName, lastName, name);
                         return LLFailedLoginResponse.LoginBlockedProblem;
                     }
                 }