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.

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;

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

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

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,

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