aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/bin
diff options
context:
space:
mode:
authorJustin Clark-Casey (justincc)2012-09-28 01:54:39 +0100
committerJustin Clark-Casey (justincc)2012-09-28 01:54:39 +0100
commitb5af17c8e35d6598f48af05429c835edc47f6d8b (patch)
tree204f0e303be3cdf7f98d0bc87a212a23857cc5ea /bin
parentLock GDI+ portion og VectorRenderModule.GetDrawStringSize() to prevent concur... (diff)
parentMerge branch 'master' of ssh://opensimulator.org/var/git/opensim (diff)
downloadopensim-SC_OLD-b5af17c8e35d6598f48af05429c835edc47f6d8b.zip
opensim-SC_OLD-b5af17c8e35d6598f48af05429c835edc47f6d8b.tar.gz
opensim-SC_OLD-b5af17c8e35d6598f48af05429c835edc47f6d8b.tar.bz2
opensim-SC_OLD-b5af17c8e35d6598f48af05429c835edc47f6d8b.tar.xz
Merge branch 'master' of ssh://opensimulator.org/var/git/opensim
Diffstat (limited to 'bin')
-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 4f0bb07..c7df7bb 100644
--- a/bin/OpenSim.ini.example
+++ b/bin/OpenSim.ini.example
@@ -951,35 +951,6 @@
951 ;# {InitialTerrain} {} {Initial terrain type} {pinhead-island flat} pinhead-island 951 ;# {InitialTerrain} {} {Initial terrain type} {pinhead-island flat} pinhead-island
952 ; InitialTerrain = "pinhead-island" 952 ; InitialTerrain = "pinhead-island"
953 953
954[TOSModule]
955 ;; Terms of Service module. It requires an external web script. Unless you
956 ;; have that in place, don't enable this module.
957
958 ;# {Enabled} {} {Enable TOS facilities} {true false} false
959 ; Enabled = false
960
961 ;; Should local users be shown the TOS on first login?
962 ;# {ShowToLocalUsers} {} {Show TOS to local users} {true false} false
963 ; ShowToLocalUsers = false
964 ;; Should foreign users be shown the TOS on first HG login?
965 ;# {ShowToForeignUsers} {} {Show TOS to foreign users} {true false} true
966 ; ShowToForeignUsers = true
967
968 ;; Tell the users what this is about
969 ; Message = "Please read and agree to the Terms of Service"
970
971 ;; How much time do the users have to accept the TOS before they get kicked out?
972 ;; (in minutes)
973 ; Timeout = 5
974
975 ;; This page should have Accept/Decline links somewhere
976 ;; that affect the GridUsers table. If you don't have such
977 ;; script in place, don't use the TOSModule. The TOSModule appends this URL
978 ;; with a query ?user={userid}&sid={sessionid}
979 ;# {TOS_URL} {} {The URL for the TOS page} {}
980 TOS_URL = "http://mygrid.com/tos"
981
982
983[Architecture] 954[Architecture]
984 ;# {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 955 ;# {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
985 ;; Uncomment one of the following includes as required. For instance, to create a standalone OpenSim, 956 ;; 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 046aa67..9c32abd 100644
--- a/bin/OpenSimDefaults.ini
+++ b/bin/OpenSimDefaults.ini
@@ -1628,10 +1628,6 @@
1628[Terrain] 1628[Terrain]
1629 InitialTerrain = "pinhead-island" 1629 InitialTerrain = "pinhead-island"
1630 1630
1631[TOSModule]
1632 ;; Enable TOS facilities
1633 Enabled = false
1634
1635;; 1631;;
1636;; If you are using a simian grid frontend you can enable 1632;; If you are using a simian grid frontend you can enable
1637;; this module to upload tile images for the mapping fn 1633;; this module to upload tile images for the mapping fn