diff options
| author | Tom | 2011-09-04 07:06:36 -0700 |
|---|---|---|
| committer | Tom | 2011-09-04 07:06:36 -0700 |
| commit | 66dec3b8742eff04fbbcc6e3249fe4ba87986500 (patch) | |
| tree | 76cc708a821d35fac5cdbbce2de304b47064e732 /OpenSim/Region/ScriptEngine/Shared/Api/Runtime/LSL_Stub.cs | |
| parent | Guard another nullref (diff) | |
| parent | Fixed BulletSim config files for Linux *.so libraries. (diff) | |
| download | opensim-SC-66dec3b8742eff04fbbcc6e3249fe4ba87986500.zip opensim-SC-66dec3b8742eff04fbbcc6e3249fe4ba87986500.tar.gz opensim-SC-66dec3b8742eff04fbbcc6e3249fe4ba87986500.tar.bz2 opensim-SC-66dec3b8742eff04fbbcc6e3249fe4ba87986500.tar.xz | |
Resolve merge commits, stage 1
Diffstat (limited to 'OpenSim/Region/ScriptEngine/Shared/Api/Runtime/LSL_Stub.cs')
| -rw-r--r-- | OpenSim/Region/ScriptEngine/Shared/Api/Runtime/LSL_Stub.cs | 5 |
1 files changed, 5 insertions, 0 deletions
diff --git a/OpenSim/Region/ScriptEngine/Shared/Api/Runtime/LSL_Stub.cs b/OpenSim/Region/ScriptEngine/Shared/Api/Runtime/LSL_Stub.cs index 7d7e54e..ca54862 100644 --- a/OpenSim/Region/ScriptEngine/Shared/Api/Runtime/LSL_Stub.cs +++ b/OpenSim/Region/ScriptEngine/Shared/Api/Runtime/LSL_Stub.cs | |||
| @@ -1206,6 +1206,11 @@ namespace OpenSim.Region.ScriptEngine.Shared.ScriptBase | |||
| 1206 | m_LSL_Functions.llRegionSay(channelID, text); | 1206 | m_LSL_Functions.llRegionSay(channelID, text); |
| 1207 | } | 1207 | } |
| 1208 | 1208 | ||
| 1209 | public void llRegionSayTo(string key, int channelID, string text) | ||
| 1210 | { | ||
| 1211 | m_LSL_Functions.llRegionSayTo(key, channelID, text); | ||
| 1212 | } | ||
| 1213 | |||
| 1209 | public void llReleaseCamera(string avatar) | 1214 | public void llReleaseCamera(string avatar) |
| 1210 | { | 1215 | { |
| 1211 | m_LSL_Functions.llReleaseCamera(avatar); | 1216 | m_LSL_Functions.llReleaseCamera(avatar); |