diff options
author | Diva Canto | 2012-09-25 20:03:49 -0700 |
---|---|---|
committer | Diva Canto | 2012-09-25 20:03:49 -0700 |
commit | ae58cf42242433c786162b53a2724962f4a8380b (patch) | |
tree | b6011d3ea34e838138a63279ec5bf270c464d04d /OpenSim/Services | |
parent | Oops, that should be inside the curly bracket. (diff) | |
download | opensim-SC_OLD-ae58cf42242433c786162b53a2724962f4a8380b.zip opensim-SC_OLD-ae58cf42242433c786162b53a2724962f4a8380b.tar.gz opensim-SC_OLD-ae58cf42242433c786162b53a2724962f4a8380b.tar.bz2 opensim-SC_OLD-ae58cf42242433c786162b53a2724962f4a8380b.tar.xz |
TOS module. WARNING: migration in GridUser table.
Diffstat (limited to 'OpenSim/Services')
-rw-r--r-- | OpenSim/Services/Interfaces/IGridUserService.cs | 8 | ||||
-rw-r--r-- | OpenSim/Services/UserAccountService/GridUserService.cs | 2 |
2 files changed, 10 insertions, 0 deletions
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 | |||
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 | |||
53 | public GridUserInfo() {} | 55 | public GridUserInfo() {} |
54 | 56 | ||
55 | public GridUserInfo(Dictionary<string, object> kvp) | 57 | public GridUserInfo(Dictionary<string, object> kvp) |
@@ -78,6 +80,11 @@ namespace OpenSim.Services.Interfaces | |||
78 | if (kvp.ContainsKey("Online")) | 80 | if (kvp.ContainsKey("Online")) |
79 | Boolean.TryParse(kvp["Online"].ToString(), out Online); | 81 | Boolean.TryParse(kvp["Online"].ToString(), out Online); |
80 | 82 | ||
83 | if (kvp.ContainsKey("TOS")) | ||
84 | TOS = kvp["TOS"].ToString(); | ||
85 | else | ||
86 | TOS = string.Empty; | ||
87 | |||
81 | } | 88 | } |
82 | 89 | ||
83 | public Dictionary<string, object> ToKeyValuePairs() | 90 | public Dictionary<string, object> ToKeyValuePairs() |
@@ -97,6 +104,7 @@ namespace OpenSim.Services.Interfaces | |||
97 | result["Login"] = Login.ToString(); | 104 | result["Login"] = Login.ToString(); |
98 | result["Logout"] = Logout.ToString(); | 105 | result["Logout"] = Logout.ToString(); |
99 | 106 | ||
107 | result["TOS"] = TOS; | ||
100 | 108 | ||
101 | return result; | 109 | return result; |
102 | } | 110 | } |
diff --git a/OpenSim/Services/UserAccountService/GridUserService.cs b/OpenSim/Services/UserAccountService/GridUserService.cs index ac3d8fd..8eae859 100644 --- a/OpenSim/Services/UserAccountService/GridUserService.cs +++ b/OpenSim/Services/UserAccountService/GridUserService.cs | |||
@@ -70,6 +70,8 @@ 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 | |||
73 | return info; | 75 | return info; |
74 | } | 76 | } |
75 | 77 | ||