diff options
| author | Melanie Thielker | 2010-07-01 17:06:29 +0200 |
|---|---|---|
| committer | Melanie Thielker | 2010-07-01 17:06:29 +0200 |
| commit | 3d5d44279b99e58cb4f2db3532df522ad3b5cccf (patch) | |
| tree | b8f42d9fc8e1ecf303e2d46680920248fa537840 /OpenSim/Region | |
| parent | Merge branch 'careminster-presence-refactor' of ssh://3dhosting.de/var/git/ca... (diff) | |
| download | opensim-SC-3d5d44279b99e58cb4f2db3532df522ad3b5cccf.zip opensim-SC-3d5d44279b99e58cb4f2db3532df522ad3b5cccf.tar.gz opensim-SC-3d5d44279b99e58cb4f2db3532df522ad3b5cccf.tar.bz2 opensim-SC-3d5d44279b99e58cb4f2db3532df522ad3b5cccf.tar.xz | |
ANother stab at LSL compatibility
Diffstat (limited to '')
| -rw-r--r-- | OpenSim/Region/CoreModules/Scripting/LSLHttp/UrlModule.cs | 2 | ||||
| -rw-r--r-- | OpenSim/Region/ScriptEngine/Shared/Api/Implementation/LSL_Api.cs | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/OpenSim/Region/CoreModules/Scripting/LSLHttp/UrlModule.cs b/OpenSim/Region/CoreModules/Scripting/LSLHttp/UrlModule.cs index ab27da9..f8cb414 100644 --- a/OpenSim/Region/CoreModules/Scripting/LSLHttp/UrlModule.cs +++ b/OpenSim/Region/CoreModules/Scripting/LSLHttp/UrlModule.cs | |||
| @@ -142,7 +142,7 @@ namespace OpenSim.Region.CoreModules.Scripting.LSLHttp | |||
| 142 | engine.PostScriptEvent(itemID, "http_request", new Object[] { urlcode.ToString(), "URL_REQUEST_DENIED", "" }); | 142 | engine.PostScriptEvent(itemID, "http_request", new Object[] { urlcode.ToString(), "URL_REQUEST_DENIED", "" }); |
| 143 | return urlcode; | 143 | return urlcode; |
| 144 | } | 144 | } |
| 145 | string url = "http://" + m_ExternalHostNameForLSL + ":" + m_HttpServer.Port.ToString() + "/lslhttp/" + urlcode.ToString() + "/"; | 145 | string url = "http://" + m_ExternalHostNameForLSL + ":" + m_HttpServer.Port.ToString() + "/lslhttp/" + urlcode.ToString(); |
| 146 | 146 | ||
| 147 | UrlData urlData = new UrlData(); | 147 | UrlData urlData = new UrlData(); |
| 148 | urlData.hostID = host.UUID; | 148 | urlData.hostID = host.UUID; |
diff --git a/OpenSim/Region/ScriptEngine/Shared/Api/Implementation/LSL_Api.cs b/OpenSim/Region/ScriptEngine/Shared/Api/Implementation/LSL_Api.cs index d49bbb2..e226682 100644 --- a/OpenSim/Region/ScriptEngine/Shared/Api/Implementation/LSL_Api.cs +++ b/OpenSim/Region/ScriptEngine/Shared/Api/Implementation/LSL_Api.cs | |||
| @@ -9394,7 +9394,7 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api | |||
| 9394 | 9394 | ||
| 9395 | if (aList.Data[i] != null) | 9395 | if (aList.Data[i] != null) |
| 9396 | { | 9396 | { |
| 9397 | switch ((ParcelMediaCommandEnum) aList.Data[i]) | 9397 | switch ((ParcelMediaCommandEnum) Convert.ToInt32(aList.Data[i].ToString())) |
| 9398 | { | 9398 | { |
| 9399 | case ParcelMediaCommandEnum.Url: | 9399 | case ParcelMediaCommandEnum.Url: |
| 9400 | list.Add(new LSL_String(World.GetLandData(m_host.AbsolutePosition.X, m_host.AbsolutePosition.Y).MediaURL)); | 9400 | list.Add(new LSL_String(World.GetLandData(m_host.AbsolutePosition.X, m_host.AbsolutePosition.Y).MediaURL)); |