From ae58cf42242433c786162b53a2724962f4a8380b Mon Sep 17 00:00:00 2001
From: Diva Canto
Date: Tue, 25 Sep 2012 20:03:49 -0700
Subject: TOS module. WARNING: migration in GridUser table.

---
 OpenSim/Services/Interfaces/IGridUserService.cs | 8 ++++++++
 1 file changed, 8 insertions(+)

(limited to 'OpenSim/Services/Interfaces/IGridUserService.cs')

diff --git a/OpenSim/Services/Interfaces/IGridUserService.cs b/OpenSim/Services/Interfaces/IGridUserService.cs
index 0a52bfa..620ed3a 100644
--- a/OpenSim/Services/Interfaces/IGridUserService.cs
+++ b/OpenSim/Services/Interfaces/IGridUserService.cs
@@ -50,6 +50,8 @@ namespace OpenSim.Services.Interfaces
         public DateTime Login;
         public DateTime Logout;
 
+        public string TOS = string.Empty;
+
         public GridUserInfo() {}
         
         public GridUserInfo(Dictionary<string, object> kvp)
@@ -78,6 +80,11 @@ namespace OpenSim.Services.Interfaces
             if (kvp.ContainsKey("Online"))
                 Boolean.TryParse(kvp["Online"].ToString(), out Online);
 
+            if (kvp.ContainsKey("TOS"))
+                TOS = kvp["TOS"].ToString();
+            else
+                TOS = string.Empty;
+
         }
 
         public Dictionary<string, object> ToKeyValuePairs()
@@ -97,6 +104,7 @@ namespace OpenSim.Services.Interfaces
             result["Login"] = Login.ToString();
             result["Logout"] = Logout.ToString();
 
+            result["TOS"] = TOS;
             
             return result;
         }
-- 
cgit v1.1


From 7a5070518833a29252fc638f9dd216040bcfad7a Mon Sep 17 00:00:00 2001
From: Diva Canto
Date: Thu, 27 Sep 2012 16:43:18 -0700
Subject: Removed the bits about the TOSModule. That module doesn't go into
 core. WARNING: migration on GridUser withdrawn too, but left the migration
 number there.

---
 OpenSim/Services/Interfaces/IGridUserService.cs | 9 ---------
 1 file changed, 9 deletions(-)

(limited to 'OpenSim/Services/Interfaces/IGridUserService.cs')

diff --git a/OpenSim/Services/Interfaces/IGridUserService.cs b/OpenSim/Services/Interfaces/IGridUserService.cs
index 620ed3a..8b738ab 100644
--- a/OpenSim/Services/Interfaces/IGridUserService.cs
+++ b/OpenSim/Services/Interfaces/IGridUserService.cs
@@ -50,8 +50,6 @@ namespace OpenSim.Services.Interfaces
         public DateTime Login;
         public DateTime Logout;
 
-        public string TOS = string.Empty;
-
         public GridUserInfo() {}
         
         public GridUserInfo(Dictionary<string, object> kvp)
@@ -80,11 +78,6 @@ namespace OpenSim.Services.Interfaces
             if (kvp.ContainsKey("Online"))
                 Boolean.TryParse(kvp["Online"].ToString(), out Online);
 
-            if (kvp.ContainsKey("TOS"))
-                TOS = kvp["TOS"].ToString();
-            else
-                TOS = string.Empty;
-
         }
 
         public Dictionary<string, object> ToKeyValuePairs()
@@ -103,8 +96,6 @@ namespace OpenSim.Services.Interfaces
             result["Online"] = Online.ToString();
             result["Login"] = Login.ToString();
             result["Logout"] = Logout.ToString();
-
-            result["TOS"] = TOS;
             
             return result;
         }
-- 
cgit v1.1


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/Interfaces/IGridUserService.cs')

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