Fix merge artefacts in the initialization code

git-svn-id: http://forge.opensimulator.org/svn/ossearch/trunk@188 109abde3-1f22-4c10-b5d7-b6b0135cd00c
This commit is contained in:
melanie
2012-06-05 11:30:19 +00:00
parent 77bde11596
commit 08e1f7172b
@@ -42,27 +42,15 @@ namespace OpenSimSearch.Modules.OpenSearch
if (searchConfig == null)
{
if (searchConfig == null)
{
m_Enabled = false;
return;
}
if (searchConfig.GetString("Module", "OpenSimSearch") != "OpenSimSearch")
return;
m_SearchServer = searchConfig.GetString("SearchURL", "");
if (m_SearchServer == "")
{
m_log.Error("[SEARCH] No search server, disabling search");
m_Enabled = false;
return;
}
else
{
m_log.Info("[SEARCH] Search module is activated");
m_Enabled = true;
}
m_Enabled = false;
return;
}
if (searchConfig.GetString("Module", "OpenSimSearch") != "OpenSimSearch")
{
m_Enabled = false;
return;
}
m_SearchServer = searchConfig.GetString("SearchURL", "");
if (m_SearchServer == "")
{