aboutsummaryrefslogtreecommitdiffstatshomepage
diff options
context:
space:
mode:
Diffstat (limited to '')
-rw-r--r--OpenSim/Region/CoreModules/Avatar/Lure/HGLureModule.cs5
-rw-r--r--OpenSim/Region/CoreModules/Framework/InventoryAccess/HGInventoryAccessModule.cs2
-rw-r--r--OpenSim/Region/CoreModules/ServiceConnectorsOut/Grid/RemoteGridServiceConnector.cs2
-rw-r--r--OpenSim/Region/OptionalModules/DataSnapshot/DataSnapshotManager.cs12
-rw-r--r--OpenSim/Region/ScriptEngine/Shared/Api/Implementation/OSSL_Api.cs4
-rw-r--r--OpenSim/Services/GridService/HypergridLinker.cs2
-rw-r--r--bin/config-include/GridCommon.ini6
-rw-r--r--bin/config-include/GridCommon.ini.example6
-rw-r--r--bin/config-include/StandaloneCommon.ini2
-rw-r--r--bin/config-include/StandaloneCommon.ini.example2
10 files changed, 21 insertions, 22 deletions
diff --git a/OpenSim/Region/CoreModules/Avatar/Lure/HGLureModule.cs b/OpenSim/Region/CoreModules/Avatar/Lure/HGLureModule.cs
index 381bb4d..dfcf925 100644
--- a/OpenSim/Region/CoreModules/Avatar/Lure/HGLureModule.cs
+++ b/OpenSim/Region/CoreModules/Avatar/Lure/HGLureModule.cs
@@ -65,11 +65,10 @@ namespace OpenSim.Region.CoreModules.Avatar.Lure
65 65
66 m_ThisGridURL = Util.GetConfigVarFromSections<string>(config, "GatekeeperURI", 66 m_ThisGridURL = Util.GetConfigVarFromSections<string>(config, "GatekeeperURI",
67 new string[] { "Startup", "Hypergrid", "Messaging" }, String.Empty); 67 new string[] { "Startup", "Hypergrid", "Messaging" }, String.Empty);
68 // Legacy. Remove soon!
69 m_ThisGridURL = config.Configs["Messaging"].GetString("Gatekeeper", m_ThisGridURL);
70
71 m_log.DebugFormat("[LURE MODULE]: {0} enabled", Name); 68 m_log.DebugFormat("[LURE MODULE]: {0} enabled", Name);
72 } 69 }
70 // Legacy. Remove soon!
71//// m_ThisGridURL = config.Configs["Messaging"].GetString("Gatekeeper", m_ThisGridURL);
73 } 72 }
74 } 73 }
75 74
diff --git a/OpenSim/Region/CoreModules/Framework/InventoryAccess/HGInventoryAccessModule.cs b/OpenSim/Region/CoreModules/Framework/InventoryAccess/HGInventoryAccessModule.cs
index 8ebd999..8f6eca6 100644
--- a/OpenSim/Region/CoreModules/Framework/InventoryAccess/HGInventoryAccessModule.cs
+++ b/OpenSim/Region/CoreModules/Framework/InventoryAccess/HGInventoryAccessModule.cs
@@ -104,7 +104,7 @@ namespace OpenSim.Region.CoreModules.Framework.InventoryAccess
104 m_ThisGatekeeper = Util.GetConfigVarFromSections<string>(source, "GatekeeperURI", 104 m_ThisGatekeeper = Util.GetConfigVarFromSections<string>(source, "GatekeeperURI",
105 new string[] { "Startup", "Hypergrid", "HGInventoryAccessModule" }, String.Empty); 105 new string[] { "Startup", "Hypergrid", "HGInventoryAccessModule" }, String.Empty);
106 // Legacy. Remove soon! 106 // Legacy. Remove soon!
107 m_ThisGatekeeper = thisModuleConfig.GetString("Gatekeeper", m_ThisGatekeeper); 107//// m_ThisGatekeeper = thisModuleConfig.GetString("Gatekeeper", m_ThisGatekeeper);
108 108
109 m_OutboundPermission = thisModuleConfig.GetBoolean("OutboundPermission", true); 109 m_OutboundPermission = thisModuleConfig.GetBoolean("OutboundPermission", true);
110 m_RestrictInventoryAccessAbroad = thisModuleConfig.GetBoolean("RestrictInventoryAccessAbroad", true); 110 m_RestrictInventoryAccessAbroad = thisModuleConfig.GetBoolean("RestrictInventoryAccessAbroad", true);
diff --git a/OpenSim/Region/CoreModules/ServiceConnectorsOut/Grid/RemoteGridServiceConnector.cs b/OpenSim/Region/CoreModules/ServiceConnectorsOut/Grid/RemoteGridServiceConnector.cs
index ee17093..0efe99d 100644
--- a/OpenSim/Region/CoreModules/ServiceConnectorsOut/Grid/RemoteGridServiceConnector.cs
+++ b/OpenSim/Region/CoreModules/ServiceConnectorsOut/Grid/RemoteGridServiceConnector.cs
@@ -129,7 +129,7 @@ namespace OpenSim.Region.CoreModules.ServiceConnectorsOut.Grid
129 m_ThisGatekeeper = Util.GetConfigVarFromSections<string>(source, "GatekeeperURI", 129 m_ThisGatekeeper = Util.GetConfigVarFromSections<string>(source, "GatekeeperURI",
130 new string[] { "Startup", "Hypergrid", "GridService" }, String.Empty); 130 new string[] { "Startup", "Hypergrid", "GridService" }, String.Empty);
131 // Legacy. Remove soon! 131 // Legacy. Remove soon!
132 m_ThisGatekeeper = gridConfig.GetString("Gatekeeper", m_ThisGatekeeper); 132//// m_ThisGatekeeper = gridConfig.GetString("Gatekeeper", m_ThisGatekeeper);
133 133
134 Util.checkServiceURI(m_ThisGatekeeper, out m_ThisGatekeeper); 134 Util.checkServiceURI(m_ThisGatekeeper, out m_ThisGatekeeper);
135 135
diff --git a/OpenSim/Region/OptionalModules/DataSnapshot/DataSnapshotManager.cs b/OpenSim/Region/OptionalModules/DataSnapshot/DataSnapshotManager.cs
index 0436f96..39e731f 100644
--- a/OpenSim/Region/OptionalModules/DataSnapshot/DataSnapshotManager.cs
+++ b/OpenSim/Region/OptionalModules/DataSnapshot/DataSnapshotManager.cs
@@ -114,12 +114,12 @@ namespace OpenSim.Region.DataSnapshot
114 string gatekeeper = Util.GetConfigVarFromSections<string>(config, "GatekeeperURI", 114 string gatekeeper = Util.GetConfigVarFromSections<string>(config, "GatekeeperURI",
115 new string[] { "Startup", "Hypergrid", "GridService" }, String.Empty); 115 new string[] { "Startup", "Hypergrid", "GridService" }, String.Empty);
116 // Legacy. Remove soon! 116 // Legacy. Remove soon!
117 if (string.IsNullOrEmpty(gatekeeper)) 117//// if (string.IsNullOrEmpty(gatekeeper))
118 { 118//// {
119 IConfig conf = config.Configs["GridService"]; 119//// IConfig conf = config.Configs["GridService"];
120 if (conf != null) 120//// if (conf != null)
121 gatekeeper = conf.GetString("Gatekeeper", gatekeeper); 121//// gatekeeper = conf.GetString("Gatekeeper", gatekeeper);
122 } 122//// }
123 if (!string.IsNullOrEmpty(gatekeeper)) 123 if (!string.IsNullOrEmpty(gatekeeper))
124 m_gridinfo.Add("gatekeeperURL", gatekeeper); 124 m_gridinfo.Add("gatekeeperURL", gatekeeper);
125 125
diff --git a/OpenSim/Region/ScriptEngine/Shared/Api/Implementation/OSSL_Api.cs b/OpenSim/Region/ScriptEngine/Shared/Api/Implementation/OSSL_Api.cs
index 2be5200..64da67e 100644
--- a/OpenSim/Region/ScriptEngine/Shared/Api/Implementation/OSSL_Api.cs
+++ b/OpenSim/Region/ScriptEngine/Shared/Api/Implementation/OSSL_Api.cs
@@ -2493,8 +2493,8 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api
2493 return gatekeeperURI; 2493 return gatekeeperURI;
2494 2494
2495 // Legacy. Remove soon! 2495 // Legacy. Remove soon!
2496 if (config.Configs["GridService"] != null) 2496//// if (config.Configs["GridService"] != null)
2497 gatekeeperURI = config.Configs["GridService"].GetString("Gatekeeper", gatekeeperURI); 2497//// gatekeeperURI = config.Configs["GridService"].GetString("Gatekeeper", gatekeeperURI);
2498 2498
2499 return gatekeeperURI; 2499 return gatekeeperURI;
2500 } 2500 }
diff --git a/OpenSim/Services/GridService/HypergridLinker.cs b/OpenSim/Services/GridService/HypergridLinker.cs
index 4887232..7c384d5 100644
--- a/OpenSim/Services/GridService/HypergridLinker.cs
+++ b/OpenSim/Services/GridService/HypergridLinker.cs
@@ -125,7 +125,7 @@ namespace OpenSim.Services.GridService
125 m_ThisGatekeeper = Util.GetConfigVarFromSections<string>(config, "GatekeeperURI", 125 m_ThisGatekeeper = Util.GetConfigVarFromSections<string>(config, "GatekeeperURI",
126 new string[] { "Startup", "Hypergrid", "GridService" }, String.Empty); 126 new string[] { "Startup", "Hypergrid", "GridService" }, String.Empty);
127 // Legacy. Remove soon! 127 // Legacy. Remove soon!
128 m_ThisGatekeeper = gridConfig.GetString("Gatekeeper", m_ThisGatekeeper); 128//// m_ThisGatekeeper = gridConfig.GetString("Gatekeeper", m_ThisGatekeeper);
129 try 129 try
130 { 130 {
131 m_ThisGatekeeperURI = new Uri(m_ThisGatekeeper); 131 m_ThisGatekeeperURI = new Uri(m_ThisGatekeeper);
diff --git a/bin/config-include/GridCommon.ini b/bin/config-include/GridCommon.ini
index 8621651..394fa18 100644
--- a/bin/config-include/GridCommon.ini
+++ b/bin/config-include/GridCommon.ini
@@ -113,7 +113,7 @@
113 ;; Change this to the address of your Gatekeeper service 113 ;; Change this to the address of your Gatekeeper service
114 ;; (usually bundled with the rest of the services in one 114 ;; (usually bundled with the rest of the services in one
115 ;; Robust server in port ${Const|PublicPort}, but not always) 115 ;; Robust server in port ${Const|PublicPort}, but not always)
116 Gatekeeper="${Const|GridURL}:${Const|PublicPort}" 116 GatekeeperURI="${Const|GridURL}:${Const|PublicPort}"
117 117
118[EstateDataStore] 118[EstateDataStore]
119 ; 119 ;
@@ -130,7 +130,7 @@
130 ;; Change this to the address of your Gatekeeper service 130 ;; Change this to the address of your Gatekeeper service
131 ;; (usually bundled with the rest of the services in one 131 ;; (usually bundled with the rest of the services in one
132 ;; Robust server in port ${Const|PublicPort}, but not always) 132 ;; Robust server in port ${Const|PublicPort}, but not always)
133 Gatekeeper = "${Const|GridURL}:${Const|PublicPort}" 133 GatekeeperURI = "${Const|GridURL}:${Const|PublicPort}"
134 134
135[AvatarService] 135[AvatarService]
136 ; 136 ;
@@ -181,7 +181,7 @@
181 ; accessible from other grids 181 ; accessible from other grids
182 ; 182 ;
183 HomeURI = "${Const|GridURL}:${Const|PublicPort}" 183 HomeURI = "${Const|GridURL}:${Const|PublicPort}"
184 Gatekeeper = "${Const|GridURL}:${Const|PublicPort}" 184 GatekeeperURI = "${Const|GridURL}:${Const|PublicPort}"
185 ;; If you want to protect your assets from being copied by foreign visitors 185 ;; If you want to protect your assets from being copied by foreign visitors
186 ;; set this to false. You may want to do this on sims that have licensed content. 186 ;; set this to false. You may want to do this on sims that have licensed content.
187 ;; Default is true. 187 ;; Default is true.
diff --git a/bin/config-include/GridCommon.ini.example b/bin/config-include/GridCommon.ini.example
index 5406295..47771e3 100644
--- a/bin/config-include/GridCommon.ini.example
+++ b/bin/config-include/GridCommon.ini.example
@@ -110,7 +110,7 @@
110 ;; Change this to the address of your Gatekeeper service 110 ;; Change this to the address of your Gatekeeper service
111 ;; (usually bundled with the rest of the services in one 111 ;; (usually bundled with the rest of the services in one
112 ;; Robust server in port ${Const|PublicPort}, but not always) 112 ;; Robust server in port ${Const|PublicPort}, but not always)
113 Gatekeeper="${Const|BaseURL}:${Const|PublicPort}" 113 GatekeeperURI="${Const|BaseURL}:${Const|PublicPort}"
114 114
115[EstateDataStore] 115[EstateDataStore]
116 ; 116 ;
@@ -127,7 +127,7 @@
127 ;; Change this to the address of your Gatekeeper service 127 ;; Change this to the address of your Gatekeeper service
128 ;; (usually bundled with the rest of the services in one 128 ;; (usually bundled with the rest of the services in one
129 ;; Robust server in port ${Const|PublicPort}, but not always) 129 ;; Robust server in port ${Const|PublicPort}, but not always)
130 Gatekeeper = "${Const|BaseURL}:${Const|PublicPort}" 130 GatekeeperURI = "${Const|BaseURL}:${Const|PublicPort}"
131 131
132[AvatarService] 132[AvatarService]
133 ; 133 ;
@@ -178,7 +178,7 @@
178 ; accessible from other grids 178 ; accessible from other grids
179 ; 179 ;
180 HomeURI = "${Const|BaseURL}:${Const|PublicPort}" 180 HomeURI = "${Const|BaseURL}:${Const|PublicPort}"
181 Gatekeeper = "${Const|BaseURL}:${Const|PublicPort}" 181 GatekeeperURI = "${Const|BaseURL}:${Const|PublicPort}"
182 ;; If you want to protect your assets from being copied by foreign visitors 182 ;; If you want to protect your assets from being copied by foreign visitors
183 ;; set this to false. You may want to do this on sims that have licensed content. 183 ;; set this to false. You may want to do this on sims that have licensed content.
184 ;; Default is true. 184 ;; Default is true.
diff --git a/bin/config-include/StandaloneCommon.ini b/bin/config-include/StandaloneCommon.ini
index 1db62c8..8da7784 100644
--- a/bin/config-include/StandaloneCommon.ini
+++ b/bin/config-include/StandaloneCommon.ini
@@ -121,7 +121,7 @@
121 121
122[LoginService] 122[LoginService]
123 WelcomeMessage = "Welcome, Avatar!" 123 WelcomeMessage = "Welcome, Avatar!"
124 ;; If you have Gatekeeper set under [Hypergrid], no need to set it here, leave it commented 124 ;; If you have GatekeeperURI set under [Hypergrid], no need to set it here, leave it commented
125 ; GatekeeperURI = "${Const|BaseURL}:${Const|PublicPort}" 125 ; GatekeeperURI = "${Const|BaseURL}:${Const|PublicPort}"
126 126
127 SRV_HomeURI = "${Const|BaseURL}:${Const|PublicPort}" 127 SRV_HomeURI = "${Const|BaseURL}:${Const|PublicPort}"
diff --git a/bin/config-include/StandaloneCommon.ini.example b/bin/config-include/StandaloneCommon.ini.example
index 53f0da2..941a2ee 100644
--- a/bin/config-include/StandaloneCommon.ini.example
+++ b/bin/config-include/StandaloneCommon.ini.example
@@ -121,7 +121,7 @@
121 121
122[LoginService] 122[LoginService]
123 WelcomeMessage = "Welcome, Avatar!" 123 WelcomeMessage = "Welcome, Avatar!"
124 ;; If you have Gatekeeper set under [Hypergrid], no need to set it here, leave it commented 124 ;; If you have GatekeeperURI set under [Hypergrid], no need to set it here, leave it commented
125 ; GatekeeperURI = "${Const|BaseURL}:${Const|PublicPort}" 125 ; GatekeeperURI = "${Const|BaseURL}:${Const|PublicPort}"
126 126
127 SRV_HomeURI = "${Const|BaseURL}:${Const|PublicPort}" 127 SRV_HomeURI = "${Const|BaseURL}:${Const|PublicPort}"