ogb912/opensim
1
0
Fork 0
mirror of https://github.com/opensim/opensim.git synced 2026-08-06 17:32:42 +08:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'master' of ssh://opensimulator.org/var/git/opensim

Browse Source
This commit is contained in:
Justin Clark-Casey (justincc)
2012-09-28 01:54:39 +01:00
parent 3db10fdbef 6511c3b5c6
commit b5af17c8e3
6 changed files with 1 additions and 47 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
OpenSim/Data/MySQL/Resources/GridUserStore.migrations
View File

@@ -19,9 +19,6 @@ CREATE TABLE `GridUser` (
COMMIT;
:VERSION 2 # --------------------------
BEGIN;
ALTER TABLE `GridUser` ADD COLUMN TOS CHAR(36);
COMMIT;

9
OpenSim/Services/Interfaces/IGridUserService.cs
View File

@@ -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;
}

2
OpenSim/Services/UserAccountService/GridUserService.cs
View File

@@ -70,8 +70,6 @@ namespace OpenSim.Services.UserAccountService
info.Login = Util.ToDateTime(Convert.ToInt32(d.Data["Login"]));
info.Logout = Util.ToDateTime(Convert.ToInt32(d.Data["Logout"]));
info.TOS = d.Data["TOS"];
return info;
}