From 2061f55007a62c4855033b4ee0e4f83ce9694580 Mon Sep 17 00:00:00 2001
From: Justin Clarke Casey
Date: Sun, 16 Dec 2007 13:57:08 +0000
Subject: Reposition 'user profile not found' messages to stop spurious
 messages caused by other usermanager usage This should stop the regular
 spurious messages in the grid user console

---
 OpenSim/Framework/Communications/LoginService.cs   |  6 +++
 .../Framework/Communications/UserManagerBase.cs    | 51 ++++++++++------------
 2 files changed, 28 insertions(+), 29 deletions(-)

(limited to 'OpenSim/Framework/Communications')

diff --git a/OpenSim/Framework/Communications/LoginService.cs b/OpenSim/Framework/Communications/LoginService.cs
index d18cf63..7c39e56 100644
--- a/OpenSim/Framework/Communications/LoginService.cs
+++ b/OpenSim/Framework/Communications/LoginService.cs
@@ -80,7 +80,13 @@ namespace OpenSim.Framework.UserManagement
 
                     userProfile = GetTheUser(firstname, lastname);
                     if (userProfile == null)
+                    {
+                        MainLog.Instance.Verbose(
+                            "LOGIN", 
+                            "Could not find a profile for " + firstname + " " + lastname);
+                        
                         return logResponse.CreateLoginFailedResponse();
+                    }
 
                     GoodLogin = AuthenticateUser(userProfile, passwd);
                 }
diff --git a/OpenSim/Framework/Communications/UserManagerBase.cs b/OpenSim/Framework/Communications/UserManagerBase.cs
index a82a58d..cc540e7 100644
--- a/OpenSim/Framework/Communications/UserManagerBase.cs
+++ b/OpenSim/Framework/Communications/UserManagerBase.cs
@@ -99,11 +99,7 @@ namespace OpenSim.Framework.UserManagement
                     profile.currentAgent = getUserAgent(profile.UUID);
                     return profile;
                 }                                              
-            }
-            
-            MainLog.Instance.Notice(
-                "USERSTORAGE", 
-                "Could not find user " + uuid.ToStringHyphenated() + " in persistent storage.");             
+            }          
 
             return null;
         }
@@ -145,10 +141,7 @@ namespace OpenSim.Framework.UserManagement
                     return profile;
                 }
             }
-                           
-            MainLog.Instance.Notice(
-                "USERSTORAGE", "Could not find user " + fname + " " + lname + " in persistent storage.");
-            
+
             return null;
         }
 
@@ -292,26 +285,26 @@ namespace OpenSim.Framework.UserManagement
             agent.currentPos = profile.homeLocation;
 
             // If user specified additional start, use that
-            if (requestData.ContainsKey("start"))
-            {
-                string startLoc = ((string) requestData["start"]).Trim();
-                if (!(startLoc == "last" || startLoc == "home"))
-                {
-                    // Format: uri:Ahern&162&213&34
-                    try
-                    {
-                        string[] parts = startLoc.Remove(0, 4).Split('&');
-                        //string region = parts[0];
-
-                        ////////////////////////////////////////////////////
-                        //SimProfile SimInfo = new SimProfile();
-                        //SimInfo = SimInfo.LoadFromGrid(theUser.currentAgent.currentHandle, _config.GridServerURL, _config.GridSendKey, _config.GridRecvKey);
-                    }
-                    catch (Exception)
-                    {
-                    }
-                }
-            }
+//            if (requestData.ContainsKey("start"))
+//            {
+//                string startLoc = ((string) requestData["start"]).Trim();
+//                if (!(startLoc == "last" || startLoc == "home"))
+//                {
+//                    // Format: uri:Ahern&162&213&34
+//                    try
+//                    {
+//                        string[] parts = startLoc.Remove(0, 4).Split('&');
+//                        //string region = parts[0];
+//
+//                        ////////////////////////////////////////////////////
+//                        //SimProfile SimInfo = new SimProfile();
+//                        //SimInfo = SimInfo.LoadFromGrid(theUser.currentAgent.currentHandle, _config.GridServerURL, _config.GridSendKey, _config.GridRecvKey);
+//                    }
+//                    catch (Exception)
+//                    {
+//                    }
+//                }
+//            }
 
             // What time did the user login?
             agent.loginTime = Util.UnixTimeSinceEpoch();
-- 
cgit v1.1