8 files changed, 23 insertions, 6 deletions

diff --git a/OpenSim/Services/AuthenticationService/AuthenticationServiceBase.cs b/OpenSim/Services/AuthenticationService/AuthenticationServiceBase.cs
index 9af61a9..edc1097 100644
--- a/OpenSim/Services/AuthenticationService/AuthenticationServiceBase.cs
+++ b/OpenSim/Services/AuthenticationService/AuthenticationServiceBase.cs
@@ -88,7 +88,7 @@ namespace OpenSim.Services.AuthenticationService
             m_Database = LoadPlugin<IAuthenticationData>(dllName,
                     new Object[] {connString, realm});
             if (m_Database == null)
-                throw new Exception("Could not find a storage interface in the given module");
+                throw new Exception(string.Format("Could not find a storage interface in module {0}", dllName));
         }
 
         public bool Verify(UUID principalID, string token, int lifetime)
diff --git a/OpenSim/Services/AuthenticationService/PasswordAuthenticationService.cs b/OpenSim/Services/AuthenticationService/PasswordAuthenticationService.cs
index 2fc9248..17619ff 100644
--- a/OpenSim/Services/AuthenticationService/PasswordAuthenticationService.cs
+++ b/OpenSim/Services/AuthenticationService/PasswordAuthenticationService.cs
@@ -71,7 +71,7 @@ namespace OpenSim.Services.AuthenticationService
                 string hashed = Util.Md5Hash(password + ":" +
                         data.Data["passwordSalt"].ToString());
 
-                //m_log.DebugFormat("[PASS AUTH]: got {0}; hashed = {1}; stored = {2}", password, hashed, data.Data["passwordHash"].ToString());
+                m_log.DebugFormat("[PASS AUTH]: got {0}; hashed = {1}; stored = {2}", password, hashed, data.Data["passwordHash"].ToString());
 
                 if (data.Data["passwordHash"].ToString() == hashed)
                 {
diff --git a/OpenSim/Services/Connectors/Friends/FriendsServiceConnector.cs b/OpenSim/Services/Connectors/Friends/FriendsServiceConnector.cs
index baefebd..d7a5731 100644
--- a/OpenSim/Services/Connectors/Friends/FriendsServiceConnector.cs
+++ b/OpenSim/Services/Connectors/Friends/FriendsServiceConnector.cs
@@ -196,7 +196,7 @@ namespace OpenSim.Services.Connectors
         {
             Dictionary<string, object> sendData = new Dictionary<string, object>();
             sendData["PRINCIPALID"] = PrincipalID.ToString();
-            sendData["FRIENDS"] = Friend;
+            sendData["FRIEND"] = Friend;
             sendData["METHOD"] = "deletefriend";
 
             string reqString = ServerUtils.BuildQueryString(sendData);
diff --git a/OpenSim/Services/Connectors/Friends/FriendsSimConnector.cs b/OpenSim/Services/Connectors/Friends/FriendsSimConnector.cs
index d7cb015..0a7b277 100644
--- a/OpenSim/Services/Connectors/Friends/FriendsSimConnector.cs
+++ b/OpenSim/Services/Connectors/Friends/FriendsSimConnector.cs
@@ -74,6 +74,9 @@ namespace OpenSim.Services.Connectors.Friends
 
         public bool FriendshipDenied(GridRegion region, UUID userID, string userName, UUID friendID)
         {
+            if (region == null)
+                return false;
+
             Dictionary<string, object> sendData = new Dictionary<string, object>();
             //sendData["VERSIONMIN"] = ProtocolVersions.ClientProtocolVersionMin.ToString();
             //sendData["VERSIONMAX"] = ProtocolVersions.ClientProtocolVersionMax.ToString();
@@ -131,7 +134,11 @@ namespace OpenSim.Services.Connectors.Friends
         private bool Call(GridRegion region, Dictionary<string, object> sendData)
         {
             string reqString = ServerUtils.BuildQueryString(sendData);
-            // m_log.DebugFormat("[FRIENDS CONNECTOR]: queryString = {0}", reqString);
+            //m_log.DebugFormat("[FRIENDS CONNECTOR]: queryString = {0}", reqString);
+            if (region == null)
+                return false;
+
+            m_log.DebugFormat("[FRIENDS CONNECTOR]: region: {0}", region.ExternalHostName + ":" + region.HttpPort);
             try
             {
                 string url = "http://" + region.ExternalHostName + ":" + region.HttpPort;
diff --git a/OpenSim/Services/Connectors/SimianGrid/SimianAuthenticationServiceConnector.cs b/OpenSim/Services/Connectors/SimianGrid/SimianAuthenticationServiceConnector.cs
index b19135e..de3ee4e 100644
--- a/OpenSim/Services/Connectors/SimianGrid/SimianAuthenticationServiceConnector.cs
+++ b/OpenSim/Services/Connectors/SimianGrid/SimianAuthenticationServiceConnector.cs
@@ -116,7 +116,7 @@ namespace OpenSim.Services.Connectors.SimianGrid
                         {
                             string credential = identity["Credential"].AsString();
 
-                            if (password == credential || "$1$" + Utils.MD5String(password) == credential || Utils.MD5String(password) == credential)
+                            if (password == credential || "$1$" + password == credential || "$1$" + Utils.MD5String(password) == credential || Utils.MD5String(password) == credential)
                                 return Authorize(principalID);
 
                             md5hashFound = true;
diff --git a/OpenSim/Services/LLLoginService/LLLoginService.cs b/OpenSim/Services/LLLoginService/LLLoginService.cs
index 83f9ade..5c12a54 100644
--- a/OpenSim/Services/LLLoginService/LLLoginService.cs
+++ b/OpenSim/Services/LLLoginService/LLLoginService.cs
@@ -209,6 +209,8 @@ namespace OpenSim.Services.LLLoginService
             bool success = false;
             UUID session = UUID.Random();
 
+            m_log.InfoFormat("[LLOGIN SERVICE]: Login request for {0} {1} from {2} with user agent {3} starting in {4}", 
+                firstName, lastName, clientIP.Address.ToString(), clientVersion, startLocation);
             try
             {
                 //
diff --git a/OpenSim/Services/PresenceService/PresenceService.cs b/OpenSim/Services/PresenceService/PresenceService.cs
index 601a69f..976153f 100644
--- a/OpenSim/Services/PresenceService/PresenceService.cs
+++ b/OpenSim/Services/PresenceService/PresenceService.cs
@@ -55,7 +55,7 @@ namespace OpenSim.Services.PresenceService
                 UUID secureSessionID)
         {
             //PresenceData[] d = m_Database.Get("UserID", userID);
-            m_Database.Get("UserID", userID);
+            //m_Database.Get("UserID", userID);
 
             PresenceData data = new PresenceData();
 
diff --git a/OpenSim/Services/UserAccountService/UserAccountService.cs b/OpenSim/Services/UserAccountService/UserAccountService.cs
index eb588f0..063251a 100644
--- a/OpenSim/Services/UserAccountService/UserAccountService.cs
+++ b/OpenSim/Services/UserAccountService/UserAccountService.cs
@@ -97,6 +97,10 @@ namespace OpenSim.Services.UserAccountService
         public UserAccount GetUserAccount(UUID scopeID, string firstName,
                 string lastName)
         {
+//                      m_log.DebugFormat(
+//                          "[USER ACCOUNT SERVICE]: Retrieving account by username for {0} {1}, scope {2}", 
+//                          firstName, lastName, scopeID);
+                        
             UserAccountData[] d;
 
             if (scopeID != UUID.Zero)
@@ -231,6 +235,10 @@ namespace OpenSim.Services.UserAccountService
 
         public bool StoreUserAccount(UserAccount data)
         {
+//                      m_log.DebugFormat(
+//                          "[USER ACCOUNT SERVICE]: Storing user account for {0} {1} {2}, scope {3}", 
+//                          data.FirstName, data.LastName, data.PrincipalID, data.ScopeID);
+                        
             UserAccountData d = new UserAccountData();
 
             d.FirstName = data.FirstName;