diff options
-rw-r--r-- | OpenSim/Region/ScriptEngine/Shared/Api/Implementation/OSSL_Api.cs | 18 |
1 files changed, 10 insertions, 8 deletions
diff --git a/OpenSim/Region/ScriptEngine/Shared/Api/Implementation/OSSL_Api.cs b/OpenSim/Region/ScriptEngine/Shared/Api/Implementation/OSSL_Api.cs index ed9a4e0..3b67966 100644 --- a/OpenSim/Region/ScriptEngine/Shared/Api/Implementation/OSSL_Api.cs +++ b/OpenSim/Region/ScriptEngine/Shared/Api/Implementation/OSSL_Api.cs | |||
@@ -128,6 +128,8 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api | |||
128 | { | 128 | { |
129 | // private static readonly ILog m_log = LogManager.GetLogger(MethodBase.GetCurrentMethod().DeclaringType); | 129 | // private static readonly ILog m_log = LogManager.GetLogger(MethodBase.GetCurrentMethod().DeclaringType); |
130 | 130 | ||
131 | public const string GridInfoServiceConfigSectionName = "GridInfoService"; | ||
132 | |||
131 | internal IScriptEngine m_ScriptEngine; | 133 | internal IScriptEngine m_ScriptEngine; |
132 | internal ILSL_Api m_LSL_Api = null; // get a reference to the LSL API so we can call methods housed there | 134 | internal ILSL_Api m_LSL_Api = null; // get a reference to the LSL API so we can call methods housed there |
133 | internal SceneObjectPart m_host; | 135 | internal SceneObjectPart m_host; |
@@ -2032,8 +2034,8 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api | |||
2032 | string nick = String.Empty; | 2034 | string nick = String.Empty; |
2033 | IConfigSource config = m_ScriptEngine.ConfigSource; | 2035 | IConfigSource config = m_ScriptEngine.ConfigSource; |
2034 | 2036 | ||
2035 | if (config.Configs["GridInfo"] != null) | 2037 | if (config.Configs[GridInfoServiceConfigSectionName] != null) |
2036 | nick = config.Configs["GridInfo"].GetString("gridnick", nick); | 2038 | nick = config.Configs[GridInfoServiceConfigSectionName].GetString("gridnick", nick); |
2037 | 2039 | ||
2038 | if (String.IsNullOrEmpty(nick)) | 2040 | if (String.IsNullOrEmpty(nick)) |
2039 | nick = GridUserInfo(InfoType.Nick); | 2041 | nick = GridUserInfo(InfoType.Nick); |
@@ -2049,8 +2051,8 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api | |||
2049 | string name = String.Empty; | 2051 | string name = String.Empty; |
2050 | IConfigSource config = m_ScriptEngine.ConfigSource; | 2052 | IConfigSource config = m_ScriptEngine.ConfigSource; |
2051 | 2053 | ||
2052 | if (config.Configs["GridInfo"] != null) | 2054 | if (config.Configs[GridInfoServiceConfigSectionName] != null) |
2053 | name = config.Configs["GridInfo"].GetString("gridname", name); | 2055 | name = config.Configs[GridInfoServiceConfigSectionName].GetString("gridname", name); |
2054 | 2056 | ||
2055 | if (String.IsNullOrEmpty(name)) | 2057 | if (String.IsNullOrEmpty(name)) |
2056 | name = GridUserInfo(InfoType.Name); | 2058 | name = GridUserInfo(InfoType.Name); |
@@ -2066,8 +2068,8 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api | |||
2066 | string loginURI = String.Empty; | 2068 | string loginURI = String.Empty; |
2067 | IConfigSource config = m_ScriptEngine.ConfigSource; | 2069 | IConfigSource config = m_ScriptEngine.ConfigSource; |
2068 | 2070 | ||
2069 | if (config.Configs["GridInfo"] != null) | 2071 | if (config.Configs[GridInfoServiceConfigSectionName] != null) |
2070 | loginURI = config.Configs["GridInfo"].GetString("login", loginURI); | 2072 | loginURI = config.Configs[GridInfoServiceConfigSectionName].GetString("login", loginURI); |
2071 | 2073 | ||
2072 | if (String.IsNullOrEmpty(loginURI)) | 2074 | if (String.IsNullOrEmpty(loginURI)) |
2073 | loginURI = GridUserInfo(InfoType.Login); | 2075 | loginURI = GridUserInfo(InfoType.Login); |
@@ -2114,8 +2116,8 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api | |||
2114 | string retval = String.Empty; | 2116 | string retval = String.Empty; |
2115 | IConfigSource config = m_ScriptEngine.ConfigSource; | 2117 | IConfigSource config = m_ScriptEngine.ConfigSource; |
2116 | 2118 | ||
2117 | if (config.Configs["GridInfo"] != null) | 2119 | if (config.Configs[GridInfoServiceConfigSectionName] != null) |
2118 | retval = config.Configs["GridInfo"].GetString(key, retval); | 2120 | retval = config.Configs[GridInfoServiceConfigSectionName].GetString(key, retval); |
2119 | 2121 | ||
2120 | if (String.IsNullOrEmpty(retval)) | 2122 | if (String.IsNullOrEmpty(retval)) |
2121 | retval = GridUserInfo(InfoType.Custom, key); | 2123 | retval = GridUserInfo(InfoType.Custom, key); |