diff options
| author | Melanie | 2012-03-03 09:58:57 +0000 |
|---|---|---|
| committer | Melanie | 2012-03-03 09:58:57 +0000 |
| commit | 1f32730798c7633bbed47736a1b302dcd13ce903 (patch) | |
| tree | 2456fc1135e91e56e0d17d9fbe67f147b7f5fda2 /OpenSim/Region/ScriptEngine/Shared/Api/Interface | |
| parent | Merge branch 'master' into careminster (diff) | |
| parent | Remove outdated comment about checking attachment prims in Scene.PipeEventsFo... (diff) | |
| download | opensim-SC-1f32730798c7633bbed47736a1b302dcd13ce903.zip opensim-SC-1f32730798c7633bbed47736a1b302dcd13ce903.tar.gz opensim-SC-1f32730798c7633bbed47736a1b302dcd13ce903.tar.bz2 opensim-SC-1f32730798c7633bbed47736a1b302dcd13ce903.tar.xz | |
Merge branch 'master' into careminster
Conflicts:
OpenSim/Framework/Servers/VersionInfo.cs
OpenSim/Region/CoreModules/World/WorldMap/WorldMapModule.cs
OpenSim/Region/Framework/Scenes/ScenePresence.cs
Diffstat (limited to 'OpenSim/Region/ScriptEngine/Shared/Api/Interface')
| -rw-r--r-- | OpenSim/Region/ScriptEngine/Shared/Api/Interface/IOSSL_Api.cs | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/OpenSim/Region/ScriptEngine/Shared/Api/Interface/IOSSL_Api.cs b/OpenSim/Region/ScriptEngine/Shared/Api/Interface/IOSSL_Api.cs index ca24051..fb52600 100644 --- a/OpenSim/Region/ScriptEngine/Shared/Api/Interface/IOSSL_Api.cs +++ b/OpenSim/Region/ScriptEngine/Shared/Api/Interface/IOSSL_Api.cs | |||
| @@ -165,6 +165,7 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api.Interfaces | |||
| 165 | 165 | ||
| 166 | LSL_String osFormatString(string str, LSL_List strings); | 166 | LSL_String osFormatString(string str, LSL_List strings); |
| 167 | LSL_List osMatchString(string src, string pattern, int start); | 167 | LSL_List osMatchString(string src, string pattern, int start); |
| 168 | LSL_String osReplaceString(string src, string pattern, string replace, int count, int start); | ||
| 168 | 169 | ||
| 169 | // Information about data loaded into the region | 170 | // Information about data loaded into the region |
| 170 | string osLoadedCreationDate(); | 171 | string osLoadedCreationDate(); |