From 682d4075e3fe7c52d4c29d00ba9dc0456b7322f3 Mon Sep 17 00:00:00 2001
From: BlueWall
Date: Wed, 23 May 2012 15:07:03 -0400
Subject: Fix llGetSimulatorHostname to return configured hostname
---
OpenSim/Region/CoreModules/Scripting/LSLHttp/UrlModule.cs | 4 ++++
OpenSim/Region/Framework/Interfaces/IUrlModule.cs | 1 +
OpenSim/Region/ScriptEngine/Shared/Api/Implementation/LSL_Api.cs | 3 ++-
3 files changed, 7 insertions(+), 1 deletion(-)
(limited to 'OpenSim/Region')
diff --git a/OpenSim/Region/CoreModules/Scripting/LSLHttp/UrlModule.cs b/OpenSim/Region/CoreModules/Scripting/LSLHttp/UrlModule.cs
index d58fc0f..d2cd163 100644
--- a/OpenSim/Region/CoreModules/Scripting/LSLHttp/UrlModule.cs
+++ b/OpenSim/Region/CoreModules/Scripting/LSLHttp/UrlModule.cs
@@ -84,6 +84,10 @@ namespace OpenSim.Region.CoreModules.Scripting.LSLHttp
private IHttpServer m_HttpsServer = null;
private string m_ExternalHostNameForLSL = "";
+ public string ExternalHostNameForLSL
+ {
+ get { return m_ExternalHostNameForLSL; }
+ }
public Type ReplaceableInterface
{
diff --git a/OpenSim/Region/Framework/Interfaces/IUrlModule.cs b/OpenSim/Region/Framework/Interfaces/IUrlModule.cs
index 1b91166..457444c 100644
--- a/OpenSim/Region/Framework/Interfaces/IUrlModule.cs
+++ b/OpenSim/Region/Framework/Interfaces/IUrlModule.cs
@@ -34,6 +34,7 @@ namespace OpenSim.Region.Framework.Interfaces
{
public interface IUrlModule
{
+ string ExternalHostNameForLSL { get; }
UUID RequestURL(IScriptModule engine, SceneObjectPart host, UUID itemID);
UUID RequestSecureURL(IScriptModule engine, SceneObjectPart host, UUID itemID);
void ReleaseURL(string url);
diff --git a/OpenSim/Region/ScriptEngine/Shared/Api/Implementation/LSL_Api.cs b/OpenSim/Region/ScriptEngine/Shared/Api/Implementation/LSL_Api.cs
index d213c35..4b28808 100644
--- a/OpenSim/Region/ScriptEngine/Shared/Api/Implementation/LSL_Api.cs
+++ b/OpenSim/Region/ScriptEngine/Shared/Api/Implementation/LSL_Api.cs
@@ -8743,7 +8743,8 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api
public LSL_String llGetSimulatorHostname()
{
m_host.AddScriptLPS(1);
- return System.Environment.MachineName;
+ IUrlModule UrlModule = World.RequestModuleInterface<IUrlModule>();
+ return UrlModule.ExternalHostNameForLSL;
}
// <summary>
--
cgit v1.1