From 0b9bf236dd336c66542215bbc8f4a1eb85c646ee Mon Sep 17 00:00:00 2001
From: Diva Canto
Date: Mon, 1 Oct 2012 15:55:24 -0700
Subject: On more virtual method

---
 OpenSim/Services/Interfaces/IGridUserService.cs | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'OpenSim/Services')

diff --git a/OpenSim/Services/Interfaces/IGridUserService.cs b/OpenSim/Services/Interfaces/IGridUserService.cs
index 8b738ab..2e7237e 100644
--- a/OpenSim/Services/Interfaces/IGridUserService.cs
+++ b/OpenSim/Services/Interfaces/IGridUserService.cs
@@ -80,7 +80,7 @@ namespace OpenSim.Services.Interfaces
 
         }
 
-        public Dictionary<string, object> ToKeyValuePairs()
+        public virtual Dictionary<string, object> ToKeyValuePairs()
         {
             Dictionary<string, object> result = new Dictionary<string, object>();
             result["UserID"] = UserID;
-- 
cgit v1.1


From e81e19a3b41be25aea49d9ccd16dad5c4cfe6dc8 Mon Sep 17 00:00:00 2001
From: SignpostMarv
Date: Mon, 1 Oct 2012 11:26:11 +0100
Subject: string format arguments in wrong order

---
 OpenSim/Services/LLLoginService/LLLoginService.cs | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'OpenSim/Services')

diff --git a/OpenSim/Services/LLLoginService/LLLoginService.cs b/OpenSim/Services/LLLoginService/LLLoginService.cs
index 495dc52..59fb559 100644
--- a/OpenSim/Services/LLLoginService/LLLoginService.cs
+++ b/OpenSim/Services/LLLoginService/LLLoginService.cs
@@ -293,7 +293,7 @@ namespace OpenSim.Services.LLLoginService
                 {
                     m_log.InfoFormat(
                         "[LLOGIN SERVICE]: Login failed for {0} {1}, reason: user level is {2} but minimum login level is {3}",
-                        firstName, lastName, m_MinLoginLevel, account.UserLevel);
+                        firstName, lastName, account.UserLevel, m_MinLoginLevel);
                     return LLFailedLoginResponse.LoginBlockedProblem;
                 }
 
-- 
cgit v1.1