aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Region/ScriptEngine
diff options
context:
space:
mode:
authorMelanie Thielker2009-05-13 03:09:30 +0000
committerMelanie Thielker2009-05-13 03:09:30 +0000
commitba8850f25446fafd0fe49b80be84a25d06303d65 (patch)
treec2389294796ffa5e32bf6039871aca1a0ca009bc /OpenSim/Region/ScriptEngine
parentAdd a skeleton for the LSLHttpServer (diff)
downloadopensim-SC_OLD-ba8850f25446fafd0fe49b80be84a25d06303d65.zip
opensim-SC_OLD-ba8850f25446fafd0fe49b80be84a25d06303d65.tar.gz
opensim-SC_OLD-ba8850f25446fafd0fe49b80be84a25d06303d65.tar.bz2
opensim-SC_OLD-ba8850f25446fafd0fe49b80be84a25d06303d65.tar.xz
Plumb request and return URL functions.
Implements llRequestURL, llRequestSecureURL, llReleaseURL
Diffstat (limited to 'OpenSim/Region/ScriptEngine')
-rw-r--r--OpenSim/Region/ScriptEngine/Shared/Api/Implementation/LSL_Api.cs13
1 files changed, 10 insertions, 3 deletions
diff --git a/OpenSim/Region/ScriptEngine/Shared/Api/Implementation/LSL_Api.cs b/OpenSim/Region/ScriptEngine/Shared/Api/Implementation/LSL_Api.cs
index a6080d6..cdb91fb 100644
--- a/OpenSim/Region/ScriptEngine/Shared/Api/Implementation/LSL_Api.cs
+++ b/OpenSim/Region/ScriptEngine/Shared/Api/Implementation/LSL_Api.cs
@@ -82,6 +82,7 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api
82 private bool m_automaticLinkPermission=false; 82 private bool m_automaticLinkPermission=false;
83 private IMessageTransferModule m_TransferModule = null; 83 private IMessageTransferModule m_TransferModule = null;
84 private int m_notecardLineReadCharsMax = 255; 84 private int m_notecardLineReadCharsMax = 255;
85 private IUrlModule m_UrlModule = null;
85 86
86 //private static readonly ILog m_log = LogManager.GetLogger(System.Reflection.MethodBase.GetCurrentMethod().DeclaringType); 87 //private static readonly ILog m_log = LogManager.GetLogger(System.Reflection.MethodBase.GetCurrentMethod().DeclaringType);
87 88
@@ -107,6 +108,8 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api
107 108
108 m_TransferModule = 109 m_TransferModule =
109 m_ScriptEngine.World.RequestModuleInterface<IMessageTransferModule>(); 110 m_ScriptEngine.World.RequestModuleInterface<IMessageTransferModule>();
111 m_UrlModule = m_ScriptEngine.World.RequestModuleInterface<IUrlModule>();
112
110 AsyncCommands = new AsyncCommandManager(ScriptEngine); 113 AsyncCommands = new AsyncCommandManager(ScriptEngine);
111 } 114 }
112 115
@@ -2700,7 +2703,8 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api
2700 public void llReleaseURL(string url) 2703 public void llReleaseURL(string url)
2701 { 2704 {
2702 m_host.AddScriptLPS(1); 2705 m_host.AddScriptLPS(1);
2703 NotImplemented("llReleaseURL"); 2706 if (m_UrlModule != null)
2707 m_UrlModule.ReleaseURL(url);
2704 } 2708 }
2705 2709
2706 public void llAttachToAvatar(int attachment) 2710 public void llAttachToAvatar(int attachment)
@@ -8030,7 +8034,8 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api
8030 public LSL_String llRequestSecureURL() 8034 public LSL_String llRequestSecureURL()
8031 { 8035 {
8032 m_host.AddScriptLPS(1); 8036 m_host.AddScriptLPS(1);
8033 NotImplemented("llRequestSecureURL"); 8037 if (m_UrlModule != null)
8038 return m_UrlModule.RequestSecureURL(m_ScriptEngine.ScriptModule, m_host, m_itemID).ToString();
8034 return UUID.Zero.ToString(); 8039 return UUID.Zero.ToString();
8035 } 8040 }
8036 8041
@@ -8110,7 +8115,9 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api
8110 public LSL_String llRequestURL() 8115 public LSL_String llRequestURL()
8111 { 8116 {
8112 m_host.AddScriptLPS(1); 8117 m_host.AddScriptLPS(1);
8113 NotImplemented("llRequestURL"); 8118
8119 if (m_UrlModule != null)
8120 return m_UrlModule.RequestURL(m_ScriptEngine.ScriptModule, m_host, m_itemID).ToString();
8114 return UUID.Zero.ToString(); 8121 return UUID.Zero.ToString();
8115 } 8122 }
8116 8123