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

connector_plugin
Justin Clark-Casey (justincc) 2012-09-28 01:54:39 +01:00
commit b5af17c8e3
6 changed files with 1 additions and 47 deletions

View File

@ -209,3 +209,4 @@ In addition, we would like to thank:
* The NANT Developers * The NANT Developers
* Microsoft (.NET, MSSQL-Adapters) * Microsoft (.NET, MSSQL-Adapters)
*x *x

View File

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

View File

@ -50,8 +50,6 @@ namespace OpenSim.Services.Interfaces
public DateTime Login; public DateTime Login;
public DateTime Logout; public DateTime Logout;
public string TOS = string.Empty;
public GridUserInfo() {} public GridUserInfo() {}
public GridUserInfo(Dictionary<string, object> kvp) public GridUserInfo(Dictionary<string, object> kvp)
@ -80,11 +78,6 @@ namespace OpenSim.Services.Interfaces
if (kvp.ContainsKey("Online")) if (kvp.ContainsKey("Online"))
Boolean.TryParse(kvp["Online"].ToString(), out 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() public Dictionary<string, object> ToKeyValuePairs()
@ -104,8 +97,6 @@ namespace OpenSim.Services.Interfaces
result["Login"] = Login.ToString(); result["Login"] = Login.ToString();
result["Logout"] = Logout.ToString(); result["Logout"] = Logout.ToString();
result["TOS"] = TOS;
return result; return result;
} }
} }

View File

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

View File

@ -951,35 +951,6 @@
;# {InitialTerrain} {} {Initial terrain type} {pinhead-island flat} pinhead-island ;# {InitialTerrain} {} {Initial terrain type} {pinhead-island flat} pinhead-island
; InitialTerrain = "pinhead-island" ; InitialTerrain = "pinhead-island"
[TOSModule]
;; Terms of Service module. It requires an external web script. Unless you
;; have that in place, don't enable this module.
;# {Enabled} {} {Enable TOS facilities} {true false} false
; Enabled = false
;; Should local users be shown the TOS on first login?
;# {ShowToLocalUsers} {} {Show TOS to local users} {true false} false
; ShowToLocalUsers = false
;; Should foreign users be shown the TOS on first HG login?
;# {ShowToForeignUsers} {} {Show TOS to foreign users} {true false} true
; ShowToForeignUsers = true
;; Tell the users what this is about
; Message = "Please read and agree to the Terms of Service"
;; How much time do the users have to accept the TOS before they get kicked out?
;; (in minutes)
; Timeout = 5
;; This page should have Accept/Decline links somewhere
;; that affect the GridUsers table. If you don't have such
;; script in place, don't use the TOSModule. The TOSModule appends this URL
;; with a query ?user={userid}&sid={sessionid}
;# {TOS_URL} {} {The URL for the TOS page} {}
TOS_URL = "http://mygrid.com/tos"
[Architecture] [Architecture]
;# {Include-Architecture} {} {Choose one of the following architectures} {config-include/Standalone.ini config-include/StandaloneHypergrid.ini config-include/Grid.ini config-include/GridHypergrid.ini config-include/SimianGrid.ini config-include/HyperSimianGrid.ini} config-include/Standalone.ini ;# {Include-Architecture} {} {Choose one of the following architectures} {config-include/Standalone.ini config-include/StandaloneHypergrid.ini config-include/Grid.ini config-include/GridHypergrid.ini config-include/SimianGrid.ini config-include/HyperSimianGrid.ini} config-include/Standalone.ini
;; Uncomment one of the following includes as required. For instance, to create a standalone OpenSim, ;; Uncomment one of the following includes as required. For instance, to create a standalone OpenSim,

View File

@ -1628,10 +1628,6 @@
[Terrain] [Terrain]
InitialTerrain = "pinhead-island" InitialTerrain = "pinhead-island"
[TOSModule]
;; Enable TOS facilities
Enabled = false
;; ;;
;; If you are using a simian grid frontend you can enable ;; If you are using a simian grid frontend you can enable
;; this module to upload tile images for the mapping fn ;; this module to upload tile images for the mapping fn