aboutsummaryrefslogtreecommitdiffstatshomepage
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
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
-rw-r--r--CONTRIBUTORS.txt1
-rw-r--r--OpenSim/Data/MySQL/Resources/GridUserStore.migrations3
-rw-r--r--OpenSim/Services/Interfaces/IGridUserService.cs9
-rw-r--r--OpenSim/Services/UserAccountService/GridUserService.cs2
-rw-r--r--bin/OpenSim.ini.example29
-rw-r--r--bin/OpenSimDefaults.ini4
6 files changed, 1 insertions, 47 deletions
diff --git a/CONTRIBUTORS.txt b/CONTRIBUTORS.txt
index f334b3d..2d02a82 100644
--- a/CONTRIBUTORS.txt
+++ b/CONTRIBUTORS.txt
@@ -209,3 +209,4 @@ In addition, we would like to thank:
209* The NANT Developers 209* The NANT Developers
210* Microsoft (.NET, MSSQL-Adapters) 210* Microsoft (.NET, MSSQL-Adapters)
211*x 211*x
212
diff --git a/OpenSim/Data/MySQL/Resources/GridUserStore.migrations b/OpenSim/Data/MySQL/Resources/GridUserStore.migrations
index 440d076..d08e096 100644
--- a/OpenSim/Data/MySQL/Resources/GridUserStore.migrations
+++ b/OpenSim/Data/MySQL/Resources/GridUserStore.migrations
@@ -19,9 +19,6 @@ CREATE TABLE `GridUser` (
19COMMIT; 19COMMIT;
20 20
21:VERSION 2 # -------------------------- 21:VERSION 2 # --------------------------
22
23BEGIN; 22BEGIN;
24 23
25ALTER TABLE `GridUser` ADD COLUMN TOS CHAR(36);
26
27COMMIT; 24COMMIT;
diff --git a/OpenSim/Services/Interfaces/IGridUserService.cs b/OpenSim/Services/Interfaces/IGridUserService.cs
index 620ed3a..8b738ab 100644
--- a/OpenSim/Services/Interfaces/IGridUserService.cs
+++ b/OpenSim/Services/Interfaces/IGridUserService.cs
@@ -50,8 +50,6 @@ namespace OpenSim.Services.Interfaces
50 public DateTime Login; 50 public DateTime Login;
51 public DateTime Logout; 51 public DateTime Logout;
52 52
53 public string TOS = string.Empty;
54
55 public GridUserInfo() {} 53 public GridUserInfo() {}
56 54
57 public GridUserInfo(Dictionary<string, object> kvp) 55 public GridUserInfo(Dictionary<string, object> kvp)
@@ -80,11 +78,6 @@ namespace OpenSim.Services.Interfaces
80 if (kvp.ContainsKey("Online")) 78 if (kvp.ContainsKey("Online"))
81 Boolean.TryParse(kvp["Online"].ToString(), out Online); 79 Boolean.TryParse(kvp["Online"].ToString(), out Online);
82 80
83 if (kvp.ContainsKey("TOS"))
84 TOS = kvp["TOS"].ToString();
85 else
86 TOS = string.Empty;
87
88 } 81 }
89 82
90 public Dictionary<string, object> ToKeyValuePairs() 83 public Dictionary<string, object> ToKeyValuePairs()
@@ -103,8 +96,6 @@ namespace OpenSim.Services.Interfaces
103 result["Online"] = Online.ToString(); 96 result["Online"] = Online.ToString();
104 result["Login"] = Login.ToString(); 97 result["Login"] = Login.ToString();
105 result["Logout"] = Logout.ToString(); 98 result["Logout"] = Logout.ToString();
106
107 result["TOS"] = TOS;
108 99
109 return result; 100 return result;
110 } 101 }
diff --git a/OpenSim/Services/UserAccountService/GridUserService.cs b/OpenSim/Services/UserAccountService/GridUserService.cs
index 8eae859..ac3d8fd 100644
--- a/OpenSim/Services/UserAccountService/GridUserService.cs
+++ b/OpenSim/Services/UserAccountService/GridUserService.cs
@@ -70,8 +70,6 @@ namespace OpenSim.Services.UserAccountService
70 info.Login = Util.ToDateTime(Convert.ToInt32(d.Data["Login"])); 70 info.Login = Util.ToDateTime(Convert.ToInt32(d.Data["Login"]));
71 info.Logout = Util.ToDateTime(Convert.ToInt32(d.Data["Logout"])); 71 info.Logout = Util.ToDateTime(Convert.ToInt32(d.Data["Logout"]));
72 72
73 info.TOS = d.Data["TOS"];
74
75 return info; 73 return info;
76 } 74 }
77 75
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