diff options
| author | Melanie | 2013-02-27 18:05:04 +0000 |
|---|---|---|
| committer | Melanie | 2013-02-27 18:05:04 +0000 |
| commit | 578174d21c82e7249016e31f0c63215e67f92f17 (patch) | |
| tree | c9c970d2ce4836dcf894922172d784d16cbc2837 /OpenSim/Region/ScriptEngine/Shared | |
| parent | Merge branch 'master' into careminster (diff) | |
| parent | Improve description of GenerateMapTiles config option (diff) | |
| download | opensim-SC_OLD-578174d21c82e7249016e31f0c63215e67f92f17.zip opensim-SC_OLD-578174d21c82e7249016e31f0c63215e67f92f17.tar.gz opensim-SC_OLD-578174d21c82e7249016e31f0c63215e67f92f17.tar.bz2 opensim-SC_OLD-578174d21c82e7249016e31f0c63215e67f92f17.tar.xz | |
Merge branch 'master' into careminster
Conflicts:
OpenSim/Framework/RegionLoader/Web/RegionLoaderWebServer.cs
OpenSim/Region/CoreModules/Scripting/LSLHttp/UrlModule.cs
OpenSim/Region/CoreModules/World/WorldMap/WorldMapModule.cs
Diffstat (limited to 'OpenSim/Region/ScriptEngine/Shared')
| -rw-r--r-- | OpenSim/Region/ScriptEngine/Shared/Api/Implementation/LSL_Api.cs | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/OpenSim/Region/ScriptEngine/Shared/Api/Implementation/LSL_Api.cs b/OpenSim/Region/ScriptEngine/Shared/Api/Implementation/LSL_Api.cs index 4c6950d..b67db20 100644 --- a/OpenSim/Region/ScriptEngine/Shared/Api/Implementation/LSL_Api.cs +++ b/OpenSim/Region/ScriptEngine/Shared/Api/Implementation/LSL_Api.cs | |||
| @@ -10201,6 +10201,7 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api | |||
| 10201 | return UUID.Zero.ToString(); | 10201 | return UUID.Zero.ToString(); |
| 10202 | } | 10202 | } |
| 10203 | } | 10203 | } |
| 10204 | |||
| 10204 | public LSL_String llRequestURL() | 10205 | public LSL_String llRequestURL() |
| 10205 | { | 10206 | { |
| 10206 | m_host.AddScriptLPS(1); | 10207 | m_host.AddScriptLPS(1); |