Thank you, patnad, for a patch that adds 3 new discovery functions

to OSSL.
Applied with changes.
Fixes Mantis #3172

3 files changed, 59 insertions, 0 deletions

diff --git a/OpenSim/Region/ScriptEngine/Shared/Api/Implementation/OSSL_Api.cs b/OpenSim/Region/ScriptEngine/Shared/Api/Implementation/OSSL_Api.cs
index fa09b0a..697fdb4 100644
--- a/OpenSim/Region/ScriptEngine/Shared/Api/Implementation/OSSL_Api.cs
+++ b/OpenSim/Region/ScriptEngine/Shared/Api/Implementation/OSSL_Api.cs
@@ -1066,5 +1066,44 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api
 
             m_host.Inventory.AddInventoryItem(taskItem, false);
         }
+
+        /// Threat level is Moderate because intentional abuse, for instance
+        /// scripts that are written to be malicious only on one grid,
+        /// for instance in a HG scenario, are a distinct possibility.
+        ///
+        /// Use value from the config file and return it.
+        ///         
+        public string osGetGridNick()
+        {
+            CheckThreatLevel(ThreatLevel.Moderate, "osGetGridNick");
+            m_host.AddScriptLPS(1);
+            string nick = "hippogrid";
+            IConfigSource config = new IniConfigSource(Application.iniFilePath);
+            if (config.Configs["GridInfo"] != null)
+                nick = config.Configs["GridInfo"].GetString("gridnick", nick);
+            return nick;
+        }
+
+        public string osGetGridName()
+        {
+            CheckThreatLevel(ThreatLevel.Moderate, "osGetGridName");
+            m_host.AddScriptLPS(1);
+            string name = "the lost continent of hippo";
+            IConfigSource config = new IniConfigSource(Application.iniFilePath);
+            if (config.Configs["GridInfo"] != null)
+                name = config.Configs["GridInfo"].GetString("gridname", name);
+            return name;
+        }
+
+        public string osGetGridLoginURI()
+        {
+            CheckThreatLevel(ThreatLevel.Moderate, "osGetGridLoginURI");
+            m_host.AddScriptLPS(1);
+            string loginURI = "http://127.0.0.1:9000/";
+            IConfigSource config = new IniConfigSource(Application.iniFilePath);
+            if (config.Configs["GridInfo"] != null)
+                loginURI = config.Configs["GridInfo"].GetString("login", loginURI);
+            return loginURI;
+        }
     }
 }
diff --git a/OpenSim/Region/ScriptEngine/Shared/Api/Interface/IOSSL_Api.cs b/OpenSim/Region/ScriptEngine/Shared/Api/Interface/IOSSL_Api.cs
index f439f34..aab91df 100644
--- a/OpenSim/Region/ScriptEngine/Shared/Api/Interface/IOSSL_Api.cs
+++ b/OpenSim/Region/ScriptEngine/Shared/Api/Interface/IOSSL_Api.cs
@@ -99,5 +99,10 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api.Interfaces
         void osMessageObject(key objectUUID,string message);
 
         void osMakeNotecard(string notecardName, LSL_Types.list contents);
+        
+        // Grid Info Functions
+        string osGetGridNick();
+        string osGetGridName();
+        string osGetGridLoginURI();
     }
 }
diff --git a/OpenSim/Region/ScriptEngine/Shared/Api/Runtime/OSSL_Stub.cs b/OpenSim/Region/ScriptEngine/Shared/Api/Runtime/OSSL_Stub.cs
index ceb0f37..50acc1e 100644
--- a/OpenSim/Region/ScriptEngine/Shared/Api/Runtime/OSSL_Stub.cs
+++ b/OpenSim/Region/ScriptEngine/Shared/Api/Runtime/OSSL_Stub.cs
@@ -247,6 +247,21 @@ namespace OpenSim.Region.ScriptEngine.Shared.ScriptBase
             m_OSSL_Functions.osMakeNotecard(notecardName, contents);
         }
 
+        public string osGetGridNick()
+        {
+            return m_OSSL_Functions.osGetGridNick();
+        }
+
+        public string osGetGridName()
+        {
+            return m_OSSL_Functions.osGetGridName();
+        }
+
+        public string osGetGridLoginURI()
+        {
+            return m_OSSL_Functions.osGetGridLoginURI();
+        }
+
         public OSSLPrim Prim;
 
         [Serializable]