aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/bin
diff options
context:
space:
mode:
authorDiva Canto2012-09-27 16:43:18 -0700
committerDiva Canto2012-09-27 16:43:18 -0700
commit7a5070518833a29252fc638f9dd216040bcfad7a (patch)
tree110893ef63c89314fb036baa69453c0bd91894eb /bin
parentUse GridUser properly for foreign users. (diff)
downloadopensim-SC-7a5070518833a29252fc638f9dd216040bcfad7a.zip
opensim-SC-7a5070518833a29252fc638f9dd216040bcfad7a.tar.gz
opensim-SC-7a5070518833a29252fc638f9dd216040bcfad7a.tar.bz2
opensim-SC-7a5070518833a29252fc638f9dd216040bcfad7a.tar.xz
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.
Diffstat (limited to '')
-rw-r--r--bin/OpenSim.ini.example29
-rw-r--r--bin/OpenSimDefaults.ini4
2 files changed, 0 insertions, 33 deletions
diff --git a/bin/OpenSim.ini.example b/bin/OpenSim.ini.example
index 6dbb611..b21a214 100644
--- a/bin/OpenSim.ini.example
+++ b/bin/OpenSim.ini.example
@@ -947,35 +947,6 @@
947 ;# {InitialTerrain} {} {Initial terrain type} {pinhead-island flat} pinhead-island 947 ;# {InitialTerrain} {} {Initial terrain type} {pinhead-island flat} pinhead-island
948 ; InitialTerrain = "pinhead-island" 948 ; InitialTerrain = "pinhead-island"
949 949
950[TOSModule]
951 ;; Terms of Service module. It requires an external web script. Unless you
952 ;; have that in place, don't enable this module.
953
954 ;# {Enabled} {} {Enable TOS facilities} {true false} false
955 ; Enabled = false
956
957 ;; Should local users be shown the TOS on first login?
958 ;# {ShowToLocalUsers} {} {Show TOS to local users} {true false} false
959 ; ShowToLocalUsers = false
960 ;; Should foreign users be shown the TOS on first HG login?
961 ;# {ShowToForeignUsers} {} {Show TOS to foreign users} {true false} true
962 ; ShowToForeignUsers = true
963
964 ;; Tell the users what this is about
965 ; Message = "Please read and agree to the Terms of Service"
966
967 ;; How much time do the users have to accept the TOS before they get kicked out?
968 ;; (in minutes)
969 ; Timeout = 5
970
971 ;; This page should have Accept/Decline links somewhere
972 ;; that affect the GridUsers table. If you don't have such
973 ;; script in place, don't use the TOSModule. The TOSModule appends this URL
974 ;; with a query ?user={userid}&sid={sessionid}
975 ;# {TOS_URL} {} {The URL for the TOS page} {}
976 TOS_URL = "http://mygrid.com/tos"
977
978
979[Architecture] 950[Architecture]
980 ;# {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 951 ;# {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
981 ;; Uncomment one of the following includes as required. For instance, to create a standalone OpenSim, 952 ;; 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 744187b..315ffbe 100644
--- a/bin/OpenSimDefaults.ini
+++ b/bin/OpenSimDefaults.ini
@@ -1624,10 +1624,6 @@
1624[Terrain] 1624[Terrain]
1625 InitialTerrain = "pinhead-island" 1625 InitialTerrain = "pinhead-island"
1626 1626
1627[TOSModule]
1628 ;; Enable TOS facilities
1629 Enabled = false
1630
1631;; 1627;;
1632;; If you are using a simian grid frontend you can enable 1628;; If you are using a simian grid frontend you can enable
1633;; this module to upload tile images for the mapping fn 1629;; this module to upload tile images for the mapping fn