diff options
Diffstat (limited to '')
3 files changed, 7 insertions, 1 deletions
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 | |||
84 | private IHttpServer m_HttpsServer = null; | 84 | private IHttpServer m_HttpsServer = null; |
85 | 85 | ||
86 | private string m_ExternalHostNameForLSL = ""; | 86 | private string m_ExternalHostNameForLSL = ""; |
87 | public string ExternalHostNameForLSL | ||
88 | { | ||
89 | get { return m_ExternalHostNameForLSL; } | ||
90 | } | ||
87 | 91 | ||
88 | public Type ReplaceableInterface | 92 | public Type ReplaceableInterface |
89 | { | 93 | { |
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 | |||
34 | { | 34 | { |
35 | public interface IUrlModule | 35 | public interface IUrlModule |
36 | { | 36 | { |
37 | string ExternalHostNameForLSL { get; } | ||
37 | UUID RequestURL(IScriptModule engine, SceneObjectPart host, UUID itemID); | 38 | UUID RequestURL(IScriptModule engine, SceneObjectPart host, UUID itemID); |
38 | UUID RequestSecureURL(IScriptModule engine, SceneObjectPart host, UUID itemID); | 39 | UUID RequestSecureURL(IScriptModule engine, SceneObjectPart host, UUID itemID); |
39 | void ReleaseURL(string url); | 40 | 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 | |||
8743 | public LSL_String llGetSimulatorHostname() | 8743 | public LSL_String llGetSimulatorHostname() |
8744 | { | 8744 | { |
8745 | m_host.AddScriptLPS(1); | 8745 | m_host.AddScriptLPS(1); |
8746 | return System.Environment.MachineName; | 8746 | IUrlModule UrlModule = World.RequestModuleInterface<IUrlModule>(); |
8747 | return UrlModule.ExternalHostNameForLSL; | ||
8747 | } | 8748 | } |
8748 | 8749 | ||
8749 | // <summary> | 8750 | // <summary> |