Fix llGetSimulatorHostname to return configured hostname

integration
BlueWall 2012-05-23 15:07:03 -04:00
parent e289006611
commit b8a0a65435
3 changed files with 7 additions and 1 deletions

View File

@ -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
{

View File

@ -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);

View File

@ -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>