aboutsummaryrefslogtreecommitdiffstatshomepage
diff options
context:
space:
mode:
authorJustin Clark-Casey (justincc)2012-06-13 04:05:02 +0100
committerJustin Clark-Casey (justincc)2012-06-13 04:05:02 +0100
commit1f34c8277d2584f0b43a43555f8b0abded4a1aa4 (patch)
tree867f89db3d1f8d4c03572d8961ad39487512b151
parentMerge branch 'master' of ssh://opensimulator.org/var/git/opensim (diff)
downloadopensim-SC_OLD-1f34c8277d2584f0b43a43555f8b0abded4a1aa4.zip
opensim-SC_OLD-1f34c8277d2584f0b43a43555f8b0abded4a1aa4.tar.gz
opensim-SC_OLD-1f34c8277d2584f0b43a43555f8b0abded4a1aa4.tar.bz2
opensim-SC_OLD-1f34c8277d2584f0b43a43555f8b0abded4a1aa4.tar.xz
In the osGetGrid functions, if the [GridInfo] section does not exist then return "Configuration Error", as already happens if there is no GridInfoURI
-rw-r--r--OpenSim/Region/ScriptEngine/Shared/Api/Implementation/OSSL_Api.cs7
1 files changed, 6 insertions, 1 deletions
diff --git a/OpenSim/Region/ScriptEngine/Shared/Api/Implementation/OSSL_Api.cs b/OpenSim/Region/ScriptEngine/Shared/Api/Implementation/OSSL_Api.cs
index 7ea8b7a..7fa25f5 100644
--- a/OpenSim/Region/ScriptEngine/Shared/Api/Implementation/OSSL_Api.cs
+++ b/OpenSim/Region/ScriptEngine/Shared/Api/Implementation/OSSL_Api.cs
@@ -1965,7 +1965,12 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api
1965 { 1965 {
1966 string retval = String.Empty; 1966 string retval = String.Empty;
1967 IConfigSource config = m_ScriptEngine.ConfigSource; 1967 IConfigSource config = m_ScriptEngine.ConfigSource;
1968 string url = config.Configs["GridInfo"].GetString("GridInfoURI", String.Empty); 1968 string url = null;
1969
1970 IConfig gridInfoConfig = config.Configs["GridInfo"];
1971
1972 if (gridInfoConfig != null)
1973 url = gridInfoConfig.GetString("GridInfoURI", String.Empty);
1969 1974
1970 if (String.IsNullOrEmpty(url)) 1975 if (String.IsNullOrEmpty(url))
1971 return "Configuration Error!"; 1976 return "Configuration Error!";