From 77bde11596c8a2e5fc1d29b147ab6a69724dbecd Mon Sep 17 00:00:00 2001
From: melanie <melanie@109abde3-1f22-4c10-b5d7-b6b0135cd00c>
Date: Mon, 4 Jun 2012 18:02:39 +0000
Subject: [PATCH] Replace the spammy init code with a cleaner version. Modules
 MUST NOT output any messages when they are disabled.

git-svn-id: http://forge.opensimulator.org/svn/ossearch/trunk@187 109abde3-1f22-4c10-b5d7-b6b0135cd00c
---
 .../Modules/SearchModule/OpenSearch.cs        | 23 ++++++++++++++++---
 1 file changed, 20 insertions(+), 3 deletions(-)

diff --git a/OpenSimSearch/Modules/SearchModule/OpenSearch.cs b/OpenSimSearch/Modules/SearchModule/OpenSearch.cs
index 1bac9c4..9245867 100644
--- a/OpenSimSearch/Modules/SearchModule/OpenSearch.cs
+++ b/OpenSimSearch/Modules/SearchModule/OpenSearch.cs
@@ -42,9 +42,26 @@ namespace OpenSimSearch.Modules.OpenSearch
 
             if (searchConfig == null)
             {
-                m_log.Info("[SEARCH] Not configured, disabling");
-                m_Enabled = false;
-                return;
+                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_SearchServer = searchConfig.GetString("SearchURL", "");
             if (m_SearchServer == "")