1 files changed, 10 insertions, 0 deletions

diff --git a/OpenSim/Services/LLLoginService/LLLoginService.cs b/OpenSim/Services/LLLoginService/LLLoginService.cs
index 4b7cb5d..602616f 100644
--- a/OpenSim/Services/LLLoginService/LLLoginService.cs
+++ b/OpenSim/Services/LLLoginService/LLLoginService.cs
@@ -227,6 +227,12 @@ namespace OpenSim.Services.LLLoginService
                     return LLFailedLoginResponse.UserProblem;
                 }
 
+                if (account.UserLevel < 0)
+                {
+                    m_log.InfoFormat("[LLOGIN SERVICE]: Login failed, reason: Unverified account");
+                    return LLFailedLoginResponse.UnverifiedAccountProblem;
+                }
+
                 if (account.UserLevel < m_MinLoginLevel)
                 {
                     m_log.InfoFormat("[LLOGIN SERVICE]: Login failed, reason: login is blocked for user level {0}", account.UserLevel);
@@ -685,7 +691,11 @@ namespace OpenSim.Services.LLLoginService
                         }
                     }
                 }
+<<<<<<< HEAD:OpenSim/Services/LLLoginService/LLLoginService.cs
+            }

+=======
             }
+>>>>>>> master:OpenSim/Services/LLLoginService/LLLoginService.cs
             dest = destination;
             if (success)
                 return aCircuit;