From 581e76942f4eb6d312b7e3bfa60abb08db03e7cd Mon Sep 17 00:00:00 2001 From: nebadon Date: Wed, 26 Sep 2012 17:49:48 -0700 Subject: [PATCH 1/4] just testing to see if pcampbot is alive yet --- CONTRIBUTORS.txt | 1 + 1 file changed, 1 insertion(+) diff --git a/CONTRIBUTORS.txt b/CONTRIBUTORS.txt index f334b3d2fc..2d02a82804 100644 --- a/CONTRIBUTORS.txt +++ b/CONTRIBUTORS.txt @@ -209,3 +209,4 @@ In addition, we would like to thank: * The NANT Developers * Microsoft (.NET, MSSQL-Adapters) *x + From f5fac2c91632f7fa25ca31d0c62416ead2d1de59 Mon Sep 17 00:00:00 2001 From: nebadon Date: Thu, 27 Sep 2012 06:37:43 -0700 Subject: [PATCH 2/4] another test to see if gitbot is alive yet --- CONTRIBUTORS.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/CONTRIBUTORS.txt b/CONTRIBUTORS.txt index 2d02a82804..9cee1da379 100644 --- a/CONTRIBUTORS.txt +++ b/CONTRIBUTORS.txt @@ -1,5 +1,5 @@ <<<>>>>The following people have contributed to OpenSim (Thank you -for your effort!) +for your effort!) = Current OpenSim Developers (in very rough order of appearance) = These folks represent the current core team for OpenSim, and are the From 0e5d3d051b74821c051bdfcd5d380c9d217e00d6 Mon Sep 17 00:00:00 2001 From: nebadon Date: Thu, 27 Sep 2012 06:51:14 -0700 Subject: [PATCH 3/4] another osgitbot test from github.. mistakes were made! --- CONTRIBUTORS.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/CONTRIBUTORS.txt b/CONTRIBUTORS.txt index 9cee1da379..2d02a82804 100644 --- a/CONTRIBUTORS.txt +++ b/CONTRIBUTORS.txt @@ -1,5 +1,5 @@ <<<>>>>The following people have contributed to OpenSim (Thank you -for your effort!) +for your effort!) = Current OpenSim Developers (in very rough order of appearance) = These folks represent the current core team for OpenSim, and are the From 7a5070518833a29252fc638f9dd216040bcfad7a Mon Sep 17 00:00:00 2001 From: Diva Canto Date: Thu, 27 Sep 2012 16:43:18 -0700 Subject: [PATCH 4/4] 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. --- .../MySQL/Resources/GridUserStore.migrations | 3 -- .../Services/Interfaces/IGridUserService.cs | 9 ------ .../UserAccountService/GridUserService.cs | 2 -- bin/OpenSim.ini.example | 29 ------------------- bin/OpenSimDefaults.ini | 4 --- 5 files changed, 47 deletions(-) diff --git a/OpenSim/Data/MySQL/Resources/GridUserStore.migrations b/OpenSim/Data/MySQL/Resources/GridUserStore.migrations index 440d076630..d08e096364 100644 --- a/OpenSim/Data/MySQL/Resources/GridUserStore.migrations +++ b/OpenSim/Data/MySQL/Resources/GridUserStore.migrations @@ -19,9 +19,6 @@ CREATE TABLE `GridUser` ( COMMIT; :VERSION 2 # -------------------------- - BEGIN; -ALTER TABLE `GridUser` ADD COLUMN TOS CHAR(36); - COMMIT; diff --git a/OpenSim/Services/Interfaces/IGridUserService.cs b/OpenSim/Services/Interfaces/IGridUserService.cs index 620ed3aa99..8b738abf51 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 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 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; } diff --git a/OpenSim/Services/UserAccountService/GridUserService.cs b/OpenSim/Services/UserAccountService/GridUserService.cs index 8eae859c14..ac3d8fda44 100644 --- a/OpenSim/Services/UserAccountService/GridUserService.cs +++ b/OpenSim/Services/UserAccountService/GridUserService.cs @@ -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; } diff --git a/bin/OpenSim.ini.example b/bin/OpenSim.ini.example index 6dbb61162a..b21a214339 100644 --- a/bin/OpenSim.ini.example +++ b/bin/OpenSim.ini.example @@ -947,35 +947,6 @@ ;# {InitialTerrain} {} {Initial terrain type} {pinhead-island flat} 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] ;# {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, diff --git a/bin/OpenSimDefaults.ini b/bin/OpenSimDefaults.ini index 744187baa7..315ffbe800 100644 --- a/bin/OpenSimDefaults.ini +++ b/bin/OpenSimDefaults.ini @@ -1624,10 +1624,6 @@ [Terrain] InitialTerrain = "pinhead-island" -[TOSModule] - ;; Enable TOS facilities - Enabled = false - ;; ;; If you are using a simian grid frontend you can enable ;; this module to upload tile images for the mapping fn