diff options
Merge commit '62a63f834b7cc056ee37c396034d0e268f66b4a8' into bigmerge
Conflicts:
OpenSim/Region/Framework/Scenes/ScenePresence.cs
Diffstat (limited to 'OpenSim/Region/ScriptEngine/Shared')
| -rw-r--r-- | OpenSim/Region/ScriptEngine/Shared/Api/Implementation/LSL_Api.cs | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/OpenSim/Region/ScriptEngine/Shared/Api/Implementation/LSL_Api.cs b/OpenSim/Region/ScriptEngine/Shared/Api/Implementation/LSL_Api.cs index eadf69c..012f7e1 100644 --- a/OpenSim/Region/ScriptEngine/Shared/Api/Implementation/LSL_Api.cs +++ b/OpenSim/Region/ScriptEngine/Shared/Api/Implementation/LSL_Api.cs | |||
| @@ -6809,7 +6809,7 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api | |||
| 6809 | public LSL_String llAvatarOnSitTarget() | 6809 | public LSL_String llAvatarOnSitTarget() |
| 6810 | { | 6810 | { |
| 6811 | m_host.AddScriptLPS(1); | 6811 | m_host.AddScriptLPS(1); |
| 6812 | return m_host.GetAvatarOnSitTarget().ToString(); | 6812 | return m_host.SitTargetAvatar.ToString(); |
| 6813 | } | 6813 | } |
| 6814 | 6814 | ||
| 6815 | // http://wiki.secondlife.com/wiki/LlAvatarOnLinkSitTarget | 6815 | // http://wiki.secondlife.com/wiki/LlAvatarOnLinkSitTarget |