aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim
diff options
context:
space:
mode:
Diffstat (limited to 'OpenSim')
-rw-r--r--OpenSim/Addons/Groups/Hypergrid/HGGroupsServiceRobustConnector.cs8
-rw-r--r--OpenSim/Framework/Util.cs22
-rw-r--r--OpenSim/Region/CoreModules/Avatar/Lure/HGLureModule.cs4
-rw-r--r--OpenSim/Region/CoreModules/Framework/InventoryAccess/HGInventoryAccessModule.cs9
-rw-r--r--OpenSim/Region/DataSnapshot/DataSnapshotManager.cs13
-rw-r--r--OpenSim/Region/ScriptEngine/Shared/Api/Implementation/OSSL_Api.cs12
-rw-r--r--OpenSim/Server/Handlers/Grid/GridInfoHandlers.cs20
-rw-r--r--OpenSim/Services/GridService/HypergridLinker.cs4
-rw-r--r--OpenSim/Services/HypergridService/GatekeeperService.cs3
-rw-r--r--OpenSim/Services/HypergridService/HGInventoryService.cs5
-rw-r--r--OpenSim/Services/HypergridService/HGSuitcaseInventoryService.cs3
-rw-r--r--OpenSim/Services/HypergridService/UserAgentService.cs11
-rw-r--r--OpenSim/Services/LLLoginService/LLLoginService.cs2
13 files changed, 79 insertions, 37 deletions
diff --git a/OpenSim/Addons/Groups/Hypergrid/HGGroupsServiceRobustConnector.cs b/OpenSim/Addons/Groups/Hypergrid/HGGroupsServiceRobustConnector.cs
index 92dd85c..0e71c72 100644
--- a/OpenSim/Addons/Groups/Hypergrid/HGGroupsServiceRobustConnector.cs
+++ b/OpenSim/Addons/Groups/Hypergrid/HGGroupsServiceRobustConnector.cs
@@ -65,14 +65,14 @@ namespace OpenSim.Groups
65 65
66 m_log.DebugFormat("[Groups.RobustHGConnector]: Starting with config name {0}", m_ConfigName); 66 m_log.DebugFormat("[Groups.RobustHGConnector]: Starting with config name {0}", m_ConfigName);
67 67
68 string homeURI = Util.GetConfigVarWithDefaultSection(config, "HomeURI", m_ConfigName); //cnf.GetString("HomeURI", string.Empty);
69 if (homeURI == string.Empty)
70 throw new Exception(String.Format("[Groups.RobustHGConnector]: please provide the HomeURI [Startup] or in section {0}", m_ConfigName));
71
68 IConfig cnf = config.Configs[m_ConfigName]; 72 IConfig cnf = config.Configs[m_ConfigName];
69 if (cnf == null) 73 if (cnf == null)
70 throw new Exception(String.Format("[Groups.RobustHGConnector]: {0} section does not exist", m_ConfigName)); 74 throw new Exception(String.Format("[Groups.RobustHGConnector]: {0} section does not exist", m_ConfigName));
71 75
72 string homeURI = cnf.GetString("HomeURI", string.Empty);
73 if (homeURI == string.Empty)
74 throw new Exception(String.Format("[Groups.RobustHGConnector]: please provide the HomeURI in section {0}", m_ConfigName));
75
76 if (im == null) 76 if (im == null)
77 { 77 {
78 string imDll = cnf.GetString("OfflineIMService", string.Empty); 78 string imDll = cnf.GetString("OfflineIMService", string.Empty);
diff --git a/OpenSim/Framework/Util.cs b/OpenSim/Framework/Util.cs
index d9148fb..1700d3e 100644
--- a/OpenSim/Framework/Util.cs
+++ b/OpenSim/Framework/Util.cs
@@ -863,7 +863,7 @@ namespace OpenSim.Framework
863 return FileName; 863 return FileName;
864 } 864 }
865 865
866 // Nini (config) related Methods 866 #region Nini (config) related Methods
867 public static IConfigSource ConvertDataRowToXMLConfig(DataRow row, string fileName) 867 public static IConfigSource ConvertDataRowToXMLConfig(DataRow row, string fileName)
868 { 868 {
869 if (!File.Exists(fileName)) 869 if (!File.Exists(fileName))
@@ -886,6 +886,26 @@ namespace OpenSim.Framework
886 } 886 }
887 } 887 }
888 888
889 public static string GetConfigVarWithDefaultSection(IConfigSource config, string varname, string section)
890 {
891 // First, check the Startup section, the default section
892 IConfig cnf = config.Configs["Startup"];
893 if (cnf == null)
894 return string.Empty;
895 string val = cnf.GetString(varname, string.Empty);
896
897 // Then check for an overwrite of the default in the given section
898 if (!string.IsNullOrEmpty(section))
899 {
900 cnf = config.Configs[section];
901 if (cnf != null)
902 val = cnf.GetString(varname, val);
903 }
904
905 return val;
906 }
907 #endregion
908
889 public static float Clip(float x, float min, float max) 909 public static float Clip(float x, float min, float max)
890 { 910 {
891 return Math.Min(Math.Max(x, min), max); 911 return Math.Min(Math.Max(x, min), max);
diff --git a/OpenSim/Region/CoreModules/Avatar/Lure/HGLureModule.cs b/OpenSim/Region/CoreModules/Avatar/Lure/HGLureModule.cs
index 232a4fe..784a788 100644
--- a/OpenSim/Region/CoreModules/Avatar/Lure/HGLureModule.cs
+++ b/OpenSim/Region/CoreModules/Avatar/Lure/HGLureModule.cs
@@ -65,7 +65,9 @@ namespace OpenSim.Region.CoreModules.Avatar.Lure
65 { 65 {
66 m_Enabled = true; 66 m_Enabled = true;
67 67
68 m_ThisGridURL = config.Configs["Messaging"].GetString("Gatekeeper", string.Empty); 68 m_ThisGridURL = Util.GetConfigVarWithDefaultSection(config, "GatekeeperURI", "Messaging");
69 // Legacy. Remove soon!
70 m_ThisGridURL = config.Configs["Messaging"].GetString("Gatekeeper", m_ThisGridURL);
69 m_log.DebugFormat("[LURE MODULE]: {0} enabled", Name); 71 m_log.DebugFormat("[LURE MODULE]: {0} enabled", Name);
70 } 72 }
71 } 73 }
diff --git a/OpenSim/Region/CoreModules/Framework/InventoryAccess/HGInventoryAccessModule.cs b/OpenSim/Region/CoreModules/Framework/InventoryAccess/HGInventoryAccessModule.cs
index 964efda..c439ea8 100644
--- a/OpenSim/Region/CoreModules/Framework/InventoryAccess/HGInventoryAccessModule.cs
+++ b/OpenSim/Region/CoreModules/Framework/InventoryAccess/HGInventoryAccessModule.cs
@@ -88,12 +88,11 @@ namespace OpenSim.Region.CoreModules.Framework.InventoryAccess
88 IConfig thisModuleConfig = source.Configs["HGInventoryAccessModule"]; 88 IConfig thisModuleConfig = source.Configs["HGInventoryAccessModule"];
89 if (thisModuleConfig != null) 89 if (thisModuleConfig != null)
90 { 90 {
91 // legacy configuration [obsolete] 91 m_HomeURI = Util.GetConfigVarWithDefaultSection(source, "HomeURI", "HGInventoryAccessModule");
92 m_HomeURI = thisModuleConfig.GetString("ProfileServerURI", string.Empty);
93 // preferred
94 m_HomeURI = thisModuleConfig.GetString("HomeURI", m_HomeURI);
95 m_OutboundPermission = thisModuleConfig.GetBoolean("OutboundPermission", true); 92 m_OutboundPermission = thisModuleConfig.GetBoolean("OutboundPermission", true);
96 m_ThisGatekeeper = thisModuleConfig.GetString("Gatekeeper", string.Empty); 93 m_ThisGatekeeper = Util.GetConfigVarWithDefaultSection(source, "GatekeeperURI", "HGInventoryAccessModule");
94 // Legacy. Renove soon!
95 m_ThisGatekeeper = thisModuleConfig.GetString("Gatekeeper", m_ThisGatekeeper);
97 m_RestrictInventoryAccessAbroad = thisModuleConfig.GetBoolean("RestrictInventoryAccessAbroad", true); 96 m_RestrictInventoryAccessAbroad = thisModuleConfig.GetBoolean("RestrictInventoryAccessAbroad", true);
98 } 97 }
99 else 98 else
diff --git a/OpenSim/Region/DataSnapshot/DataSnapshotManager.cs b/OpenSim/Region/DataSnapshot/DataSnapshotManager.cs
index 5e62f23..13d9d31 100644
--- a/OpenSim/Region/DataSnapshot/DataSnapshotManager.cs
+++ b/OpenSim/Region/DataSnapshot/DataSnapshotManager.cs
@@ -113,9 +113,16 @@ namespace OpenSim.Region.DataSnapshot
113 try 113 try
114 { 114 {
115 m_enabled = config.Configs["DataSnapshot"].GetBoolean("index_sims", m_enabled); 115 m_enabled = config.Configs["DataSnapshot"].GetBoolean("index_sims", m_enabled);
116 IConfig conf = config.Configs["GridService"]; 116 string gatekeeper = Util.GetConfigVarWithDefaultSection(config, "GatekeeperURI", "GridService");
117 if (conf != null) 117 // Legacy. Remove soon!
118 m_gridinfo.Add("gatekeeperURL", conf.GetString("Gatekeeper", String.Empty)); 118 if (string.IsNullOrEmpty(gatekeeper))
119 {
120 IConfig conf = config.Configs["GridService"];
121 if (conf != null)
122 gatekeeper = conf.GetString("Gatekeeper", gatekeeper);
123 }
124 if (!string.IsNullOrEmpty(gatekeeper))
125 m_gridinfo.Add("gatekeeperURL", gatekeeper);
119 126
120 m_gridinfo.Add( 127 m_gridinfo.Add(
121 "name", config.Configs["DataSnapshot"].GetString("gridname", "the lost continent of hippo")); 128 "name", config.Configs["DataSnapshot"].GetString("gridname", "the lost continent of hippo"));
diff --git a/OpenSim/Region/ScriptEngine/Shared/Api/Implementation/OSSL_Api.cs b/OpenSim/Region/ScriptEngine/Shared/Api/Implementation/OSSL_Api.cs
index 1426070..0334169 100644
--- a/OpenSim/Region/ScriptEngine/Shared/Api/Implementation/OSSL_Api.cs
+++ b/OpenSim/Region/ScriptEngine/Shared/Api/Implementation/OSSL_Api.cs
@@ -2137,9 +2137,13 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api
2137 CheckThreatLevel(ThreatLevel.Moderate, "osGetGridHomeURI"); 2137 CheckThreatLevel(ThreatLevel.Moderate, "osGetGridHomeURI");
2138 m_host.AddScriptLPS(1); 2138 m_host.AddScriptLPS(1);
2139 2139
2140 string HomeURI = String.Empty;
2141 IConfigSource config = m_ScriptEngine.ConfigSource; 2140 IConfigSource config = m_ScriptEngine.ConfigSource;
2141 string HomeURI = Util.GetConfigVarWithDefaultSection(config, "HomeURI", string.Empty);
2142 2142
2143 if (!string.IsNullOrEmpty(HomeURI))
2144 return HomeURI;
2145
2146 // Legacy. Remove soon!
2143 if (config.Configs["LoginService"] != null) 2147 if (config.Configs["LoginService"] != null)
2144 HomeURI = config.Configs["LoginService"].GetString("SRV_HomeURI", HomeURI); 2148 HomeURI = config.Configs["LoginService"].GetString("SRV_HomeURI", HomeURI);
2145 2149
@@ -2154,9 +2158,13 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api
2154 CheckThreatLevel(ThreatLevel.Moderate, "osGetGridGatekeeperURI"); 2158 CheckThreatLevel(ThreatLevel.Moderate, "osGetGridGatekeeperURI");
2155 m_host.AddScriptLPS(1); 2159 m_host.AddScriptLPS(1);
2156 2160
2157 string gatekeeperURI = String.Empty;
2158 IConfigSource config = m_ScriptEngine.ConfigSource; 2161 IConfigSource config = m_ScriptEngine.ConfigSource;
2162 string gatekeeperURI = Util.GetConfigVarWithDefaultSection(config, "GatekeeperURI", string.Empty);
2163
2164 if (!string.IsNullOrEmpty(gatekeeperURI))
2165 return gatekeeperURI;
2159 2166
2167 // Legacy. Remove soon!
2160 if (config.Configs["GridService"] != null) 2168 if (config.Configs["GridService"] != null)
2161 gatekeeperURI = config.Configs["GridService"].GetString("Gatekeeper", gatekeeperURI); 2169 gatekeeperURI = config.Configs["GridService"].GetString("Gatekeeper", gatekeeperURI);
2162 2170
diff --git a/OpenSim/Server/Handlers/Grid/GridInfoHandlers.cs b/OpenSim/Server/Handlers/Grid/GridInfoHandlers.cs
index 965a54e..35f86c5 100644
--- a/OpenSim/Server/Handlers/Grid/GridInfoHandlers.cs
+++ b/OpenSim/Server/Handlers/Grid/GridInfoHandlers.cs
@@ -170,14 +170,6 @@ namespace OpenSim.Server.Handlers.Grid
170 public string JsonGetGridInfoMethod(string request, string path, string param, 170 public string JsonGetGridInfoMethod(string request, string path, string param,
171 IOSHttpRequest httpRequest, IOSHttpResponse httpResponse) 171 IOSHttpRequest httpRequest, IOSHttpResponse httpResponse)
172 { 172 {
173 string HomeURI = String.Empty;
174 IConfig cfg = m_Config.Configs["LoginService"];
175
176 if (null != cfg)
177 {
178 HomeURI = cfg.GetString("SRV_HomeURI", HomeURI);
179 }
180
181 OSDMap map = new OSDMap(); 173 OSDMap map = new OSDMap();
182 174
183 foreach (string k in _info.Keys) 175 foreach (string k in _info.Keys)
@@ -185,9 +177,19 @@ namespace OpenSim.Server.Handlers.Grid
185 map[k] = OSD.FromString(_info[k].ToString()); 177 map[k] = OSD.FromString(_info[k].ToString());
186 } 178 }
187 179
180 string HomeURI = Util.GetConfigVarWithDefaultSection(m_Config, "HomeURI", string.Empty);
181
188 if (!String.IsNullOrEmpty(HomeURI)) 182 if (!String.IsNullOrEmpty(HomeURI))
183 map["home"] = OSD.FromString(HomeURI);
184 else // Legacy. Remove soon!
189 { 185 {
190 map["home"] = OSD.FromString(HomeURI); 186 IConfig cfg = m_Config.Configs["LoginService"];
187
188 if (null != cfg)
189 HomeURI = cfg.GetString("SRV_HomeURI", HomeURI);
190
191 if (!String.IsNullOrEmpty(HomeURI))
192 map["home"] = OSD.FromString(HomeURI);
191 } 193 }
192 194
193 return OSDParser.SerializeJsonString(map).ToString(); 195 return OSDParser.SerializeJsonString(map).ToString();
diff --git a/OpenSim/Services/GridService/HypergridLinker.cs b/OpenSim/Services/GridService/HypergridLinker.cs
index 073197f..3e7c556 100644
--- a/OpenSim/Services/GridService/HypergridLinker.cs
+++ b/OpenSim/Services/GridService/HypergridLinker.cs
@@ -128,7 +128,9 @@ namespace OpenSim.Services.GridService
128 128
129 m_MapTileDirectory = gridConfig.GetString("MapTileDirectory", "maptiles"); 129 m_MapTileDirectory = gridConfig.GetString("MapTileDirectory", "maptiles");
130 130
131 m_ThisGatekeeper = gridConfig.GetString("Gatekeeper", string.Empty); 131 m_ThisGatekeeper = Util.GetConfigVarWithDefaultSection(config, "GatekeeperURI", "GridService");
132 // Legacy. Remove soon!
133 m_ThisGatekeeper = gridConfig.GetString("Gatekeeper", m_ThisGatekeeper);
132 try 134 try
133 { 135 {
134 m_ThisGatekeeperURI = new Uri(m_ThisGatekeeper); 136 m_ThisGatekeeperURI = new Uri(m_ThisGatekeeper);
diff --git a/OpenSim/Services/HypergridService/GatekeeperService.cs b/OpenSim/Services/HypergridService/GatekeeperService.cs
index 7b84d55..21f363c 100644
--- a/OpenSim/Services/HypergridService/GatekeeperService.cs
+++ b/OpenSim/Services/HypergridService/GatekeeperService.cs
@@ -96,7 +96,8 @@ namespace OpenSim.Services.HypergridService
96 UUID.TryParse(scope, out m_ScopeID); 96 UUID.TryParse(scope, out m_ScopeID);
97 //m_WelcomeMessage = serverConfig.GetString("WelcomeMessage", "Welcome to OpenSim!"); 97 //m_WelcomeMessage = serverConfig.GetString("WelcomeMessage", "Welcome to OpenSim!");
98 m_AllowTeleportsToAnyRegion = serverConfig.GetBoolean("AllowTeleportsToAnyRegion", true); 98 m_AllowTeleportsToAnyRegion = serverConfig.GetBoolean("AllowTeleportsToAnyRegion", true);
99 m_ExternalName = serverConfig.GetString("ExternalName", string.Empty); 99 m_ExternalName = Util.GetConfigVarWithDefaultSection(config, "GatekeeperURI", "GatekeeperService");
100 m_ExternalName = serverConfig.GetString("ExternalName", m_ExternalName);
100 if (m_ExternalName != string.Empty && !m_ExternalName.EndsWith("/")) 101 if (m_ExternalName != string.Empty && !m_ExternalName.EndsWith("/"))
101 m_ExternalName = m_ExternalName + "/"; 102 m_ExternalName = m_ExternalName + "/";
102 103
diff --git a/OpenSim/Services/HypergridService/HGInventoryService.cs b/OpenSim/Services/HypergridService/HGInventoryService.cs
index 2e9bd40..a9661f4 100644
--- a/OpenSim/Services/HypergridService/HGInventoryService.cs
+++ b/OpenSim/Services/HypergridService/HGInventoryService.cs
@@ -81,10 +81,7 @@ namespace OpenSim.Services.HypergridService
81 if (m_UserAccountService == null) 81 if (m_UserAccountService == null)
82 throw new Exception(String.Format("Unable to create UserAccountService from {0}", userAccountsDll)); 82 throw new Exception(String.Format("Unable to create UserAccountService from {0}", userAccountsDll));
83 83
84 // legacy configuration [obsolete] 84 m_HomeURL = Util.GetConfigVarWithDefaultSection(config, "HomeURI", m_ConfigName);
85 m_HomeURL = invConfig.GetString("ProfileServerURI", string.Empty);
86 // Preferred
87 m_HomeURL = invConfig.GetString("HomeURI", m_HomeURL);
88 85
89 m_Cache = UserAccountCache.CreateUserAccountCache(m_UserAccountService); 86 m_Cache = UserAccountCache.CreateUserAccountCache(m_UserAccountService);
90 } 87 }
diff --git a/OpenSim/Services/HypergridService/HGSuitcaseInventoryService.cs b/OpenSim/Services/HypergridService/HGSuitcaseInventoryService.cs
index 784f136..dd546b8 100644
--- a/OpenSim/Services/HypergridService/HGSuitcaseInventoryService.cs
+++ b/OpenSim/Services/HypergridService/HGSuitcaseInventoryService.cs
@@ -96,8 +96,7 @@ namespace OpenSim.Services.HypergridService
96 if (m_AvatarService == null) 96 if (m_AvatarService == null)
97 throw new Exception(String.Format("Unable to create m_AvatarService from {0}", avatarDll)); 97 throw new Exception(String.Format("Unable to create m_AvatarService from {0}", avatarDll));
98 98
99 // Preferred 99 m_HomeURL = Util.GetConfigVarWithDefaultSection(config, "HomeURI", m_ConfigName);
100 m_HomeURL = invConfig.GetString("HomeURI", m_HomeURL);
101 100
102// m_Cache = UserAccountCache.CreateUserAccountCache(m_UserAccountService); 101// m_Cache = UserAccountCache.CreateUserAccountCache(m_UserAccountService);
103 } 102 }
diff --git a/OpenSim/Services/HypergridService/UserAgentService.cs b/OpenSim/Services/HypergridService/UserAgentService.cs
index a26a922..8757a4c 100644
--- a/OpenSim/Services/HypergridService/UserAgentService.cs
+++ b/OpenSim/Services/HypergridService/UserAgentService.cs
@@ -131,12 +131,17 @@ namespace OpenSim.Services.HypergridService
131 LoadDomainExceptionsFromConfig(serverConfig, "AllowExcept", m_TripsAllowedExceptions); 131 LoadDomainExceptionsFromConfig(serverConfig, "AllowExcept", m_TripsAllowedExceptions);
132 LoadDomainExceptionsFromConfig(serverConfig, "DisallowExcept", m_TripsDisallowedExceptions); 132 LoadDomainExceptionsFromConfig(serverConfig, "DisallowExcept", m_TripsDisallowedExceptions);
133 133
134 m_GridName = serverConfig.GetString("ExternalName", string.Empty); 134 m_GridName = Util.GetConfigVarWithDefaultSection(config, "GatekeeperURI", "UserAgentService");
135 if (m_GridName == string.Empty) 135 if (string.IsNullOrEmpty(m_GridName)) // Legacy. Remove soon.
136 { 136 {
137 serverConfig = config.Configs["GatekeeperService"];
138 m_GridName = serverConfig.GetString("ExternalName", string.Empty); 137 m_GridName = serverConfig.GetString("ExternalName", string.Empty);
138 if (m_GridName == string.Empty)
139 {
140 serverConfig = config.Configs["GatekeeperService"];
141 m_GridName = serverConfig.GetString("ExternalName", string.Empty);
142 }
139 } 143 }
144
140 if (!m_GridName.EndsWith("/")) 145 if (!m_GridName.EndsWith("/"))
141 m_GridName = m_GridName + "/"; 146 m_GridName = m_GridName + "/";
142 147
diff --git a/OpenSim/Services/LLLoginService/LLLoginService.cs b/OpenSim/Services/LLLoginService/LLLoginService.cs
index 5f30f84..7f32d30 100644
--- a/OpenSim/Services/LLLoginService/LLLoginService.cs
+++ b/OpenSim/Services/LLLoginService/LLLoginService.cs
@@ -110,7 +110,7 @@ namespace OpenSim.Services.LLLoginService
110 m_RequireInventory = m_LoginServerConfig.GetBoolean("RequireInventory", true); 110 m_RequireInventory = m_LoginServerConfig.GetBoolean("RequireInventory", true);
111 m_AllowRemoteSetLoginLevel = m_LoginServerConfig.GetBoolean("AllowRemoteSetLoginLevel", false); 111 m_AllowRemoteSetLoginLevel = m_LoginServerConfig.GetBoolean("AllowRemoteSetLoginLevel", false);
112 m_MinLoginLevel = m_LoginServerConfig.GetInt("MinLoginLevel", 0); 112 m_MinLoginLevel = m_LoginServerConfig.GetInt("MinLoginLevel", 0);
113 m_GatekeeperURL = m_LoginServerConfig.GetString("GatekeeperURI", string.Empty); 113 m_GatekeeperURL = Util.GetConfigVarWithDefaultSection(config, "GatekeeperURI", "LoginService");
114 m_MapTileURL = m_LoginServerConfig.GetString("MapTileURL", string.Empty); 114 m_MapTileURL = m_LoginServerConfig.GetString("MapTileURL", string.Empty);
115 m_ProfileURL = m_LoginServerConfig.GetString("ProfileServerURL", string.Empty); 115 m_ProfileURL = m_LoginServerConfig.GetString("ProfileServerURL", string.Empty);
116 m_OpenIDURL = m_LoginServerConfig.GetString("OpenIDServerURL", String.Empty); 116 m_OpenIDURL = m_LoginServerConfig.GetString("OpenIDServerURL", String.Empty);