diff options
author | Melanie | 2012-11-09 22:58:42 +0000 |
---|---|---|
committer | Melanie | 2012-11-09 22:58:42 +0000 |
commit | 415b89f434657fe4cbf62a5c99f24c2648a313ac (patch) | |
tree | 48d7e97cc64a4351755942745a9a8f65d52b5322 /OpenSim/Region/ScriptEngine/Shared/Api/Implementation | |
parent | Merge branch 'master' into careminster (diff) | |
parent | llSetLinkCamera implementation (diff) | |
download | opensim-SC-415b89f434657fe4cbf62a5c99f24c2648a313ac.zip opensim-SC-415b89f434657fe4cbf62a5c99f24c2648a313ac.tar.gz opensim-SC-415b89f434657fe4cbf62a5c99f24c2648a313ac.tar.bz2 opensim-SC-415b89f434657fe4cbf62a5c99f24c2648a313ac.tar.xz |
Merge branch 'master' into careminster
Diffstat (limited to 'OpenSim/Region/ScriptEngine/Shared/Api/Implementation')
-rw-r--r-- | OpenSim/Region/ScriptEngine/Shared/Api/Implementation/LSL_Api.cs | 30 |
1 files changed, 30 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 3bbdbe8..700f538 100644 --- a/OpenSim/Region/ScriptEngine/Shared/Api/Implementation/LSL_Api.cs +++ b/OpenSim/Region/ScriptEngine/Shared/Api/Implementation/LSL_Api.cs | |||
@@ -7105,6 +7105,36 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api | |||
7105 | m_host.SetCameraAtOffset(offset); | 7105 | m_host.SetCameraAtOffset(offset); |
7106 | } | 7106 | } |
7107 | 7107 | ||
7108 | public void llSetLinkCamera(LSL_Integer link, LSL_Vector eye, LSL_Vector at) | ||
7109 | { | ||
7110 | m_host.AddScriptLPS(1); | ||
7111 | |||
7112 | if (link == ScriptBaseClass.LINK_SET || | ||
7113 | link == ScriptBaseClass.LINK_ALL_CHILDREN || | ||
7114 | link == ScriptBaseClass.LINK_ALL_OTHERS) return; | ||
7115 | |||
7116 | SceneObjectPart part = null; | ||
7117 | |||
7118 | switch (link) | ||
7119 | { | ||
7120 | case ScriptBaseClass.LINK_ROOT: | ||
7121 | part = m_host.ParentGroup.RootPart; | ||
7122 | break; | ||
7123 | case ScriptBaseClass.LINK_THIS: | ||
7124 | part = m_host; | ||
7125 | break; | ||
7126 | default: | ||
7127 | part = m_host.ParentGroup.GetLinkNumPart(link); | ||
7128 | break; | ||
7129 | } | ||
7130 | |||
7131 | if (null != part) | ||
7132 | { | ||
7133 | part.SetCameraEyeOffset(eye); | ||
7134 | part.SetCameraAtOffset(at); | ||
7135 | } | ||
7136 | } | ||
7137 | |||
7108 | public LSL_String llDumpList2String(LSL_List src, string seperator) | 7138 | public LSL_String llDumpList2String(LSL_List src, string seperator) |
7109 | { | 7139 | { |
7110 | m_host.AddScriptLPS(1); | 7140 | m_host.AddScriptLPS(1); |