aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim
diff options
context:
space:
mode:
authorJustin Clark-Casey (justincc)2012-09-28 01:54:39 +0100
committerJustin Clark-Casey (justincc)2012-09-28 01:54:39 +0100
commitb5af17c8e35d6598f48af05429c835edc47f6d8b (patch)
tree204f0e303be3cdf7f98d0bc87a212a23857cc5ea /OpenSim
parentLock GDI+ portion og VectorRenderModule.GetDrawStringSize() to prevent concur... (diff)
parentMerge branch 'master' of ssh://opensimulator.org/var/git/opensim (diff)
downloadopensim-SC-b5af17c8e35d6598f48af05429c835edc47f6d8b.zip
opensim-SC-b5af17c8e35d6598f48af05429c835edc47f6d8b.tar.gz
opensim-SC-b5af17c8e35d6598f48af05429c835edc47f6d8b.tar.bz2
opensim-SC-b5af17c8e35d6598f48af05429c835edc47f6d8b.tar.xz
Merge branch 'master' of ssh://opensimulator.org/var/git/opensim
Diffstat (limited to '')
-rw-r--r--OpenSim/Data/MySQL/Resources/GridUserStore.migrations3
-rw-r--r--OpenSim/Services/Interfaces/IGridUserService.cs9
-rw-r--r--OpenSim/Services/UserAccountService/GridUserService.cs2
3 files changed, 0 insertions, 14 deletions
diff --git a/OpenSim/Data/MySQL/Resources/GridUserStore.migrations b/OpenSim/Data/MySQL/Resources/GridUserStore.migrations
index 440d076..d08e096 100644
--- a/OpenSim/Data/MySQL/Resources/GridUserStore.migrations
+++ b/OpenSim/Data/MySQL/Resources/GridUserStore.migrations
@@ -19,9 +19,6 @@ CREATE TABLE `GridUser` (
19COMMIT; 19COMMIT;
20 20
21:VERSION 2 # -------------------------- 21:VERSION 2 # --------------------------
22
23BEGIN; 22BEGIN;
24 23
25ALTER TABLE `GridUser` ADD COLUMN TOS CHAR(36);
26
27COMMIT; 24COMMIT;
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
50 public DateTime Login; 50 public DateTime Login;
51 public DateTime Logout; 51 public DateTime Logout;
52 52
53 public string TOS = string.Empty;
54
55 public GridUserInfo() {} 53 public GridUserInfo() {}
56 54
57 public GridUserInfo(Dictionary<string, object> kvp) 55 public GridUserInfo(Dictionary<string, object> kvp)
@@ -80,11 +78,6 @@ namespace OpenSim.Services.Interfaces
80 if (kvp.ContainsKey("Online")) 78 if (kvp.ContainsKey("Online"))
81 Boolean.TryParse(kvp["Online"].ToString(), out Online); 79 Boolean.TryParse(kvp["Online"].ToString(), out Online);
82 80
83 if (kvp.ContainsKey("TOS"))
84 TOS = kvp["TOS"].ToString();
85 else
86 TOS = string.Empty;
87
88 } 81 }
89 82
90 public Dictionary<string, object> ToKeyValuePairs() 83 public Dictionary<string, object> ToKeyValuePairs()
@@ -103,8 +96,6 @@ namespace OpenSim.Services.Interfaces
103 result["Online"] = Online.ToString(); 96 result["Online"] = Online.ToString();
104 result["Login"] = Login.ToString(); 97 result["Login"] = Login.ToString();
105 result["Logout"] = Logout.ToString(); 98 result["Logout"] = Logout.ToString();
106
107 result["TOS"] = TOS;
108 99
109 return result; 100 return result;
110 } 101 }
diff --git a/OpenSim/Services/UserAccountService/GridUserService.cs b/OpenSim/Services/UserAccountService/GridUserService.cs
index 8eae859..ac3d8fd 100644
--- a/OpenSim/Services/UserAccountService/GridUserService.cs
+++ b/OpenSim/Services/UserAccountService/GridUserService.cs
@@ -70,8 +70,6 @@ namespace OpenSim.Services.UserAccountService
70 info.Login = Util.ToDateTime(Convert.ToInt32(d.Data["Login"])); 70 info.Login = Util.ToDateTime(Convert.ToInt32(d.Data["Login"]));
71 info.Logout = Util.ToDateTime(Convert.ToInt32(d.Data["Logout"])); 71 info.Logout = Util.ToDateTime(Convert.ToInt32(d.Data["Logout"]));
72 72
73 info.TOS = d.Data["TOS"];
74
75 return info; 73 return info;
76 } 74 }
77 75