diff options
author | Justin Clark-Casey (justincc) | 2009-11-03 19:11:09 +0000 |
---|---|---|
committer | Justin Clark-Casey (justincc) | 2009-11-03 19:11:09 +0000 |
commit | af0e5d097480de264e7501e7d5d35328be5640bb (patch) | |
tree | 4ca5cd796ed9618dc9134a6e5eee1f7e7912bee4 /OpenSim/Region/ScriptEngine/Shared/Api/Implementation | |
parent | minor: remove some mono compiler warnings (diff) | |
parent | Fixed a couple of NREs in corner cases. (diff) | |
download | opensim-SC_OLD-af0e5d097480de264e7501e7d5d35328be5640bb.zip opensim-SC_OLD-af0e5d097480de264e7501e7d5d35328be5640bb.tar.gz opensim-SC_OLD-af0e5d097480de264e7501e7d5d35328be5640bb.tar.bz2 opensim-SC_OLD-af0e5d097480de264e7501e7d5d35328be5640bb.tar.xz |
Merge branch 'master' of ssh://justincc@opensimulator.org/var/git/opensim
Diffstat (limited to 'OpenSim/Region/ScriptEngine/Shared/Api/Implementation')
-rw-r--r-- | OpenSim/Region/ScriptEngine/Shared/Api/Implementation/LSL_Api.cs | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/OpenSim/Region/ScriptEngine/Shared/Api/Implementation/LSL_Api.cs b/OpenSim/Region/ScriptEngine/Shared/Api/Implementation/LSL_Api.cs index 3849558..0ea62d7 100644 --- a/OpenSim/Region/ScriptEngine/Shared/Api/Implementation/LSL_Api.cs +++ b/OpenSim/Region/ScriptEngine/Shared/Api/Implementation/LSL_Api.cs | |||
@@ -2163,7 +2163,7 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api | |||
2163 | public LSL_Vector llGetOmega() | 2163 | public LSL_Vector llGetOmega() |
2164 | { | 2164 | { |
2165 | m_host.AddScriptLPS(1); | 2165 | m_host.AddScriptLPS(1); |
2166 | return new LSL_Vector(m_host.RotationalVelocity.X, m_host.RotationalVelocity.Y, m_host.RotationalVelocity.Z); | 2166 | return new LSL_Vector(m_host.AngularVelocity.X, m_host.AngularVelocity.Y, m_host.AngularVelocity.Z); |
2167 | } | 2167 | } |
2168 | 2168 | ||
2169 | public LSL_Float llGetTimeOfDay() | 2169 | public LSL_Float llGetTimeOfDay() |
@@ -3159,7 +3159,6 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api | |||
3159 | public void llTargetOmega(LSL_Vector axis, double spinrate, double gain) | 3159 | public void llTargetOmega(LSL_Vector axis, double spinrate, double gain) |
3160 | { | 3160 | { |
3161 | m_host.AddScriptLPS(1); | 3161 | m_host.AddScriptLPS(1); |
3162 | m_host.RotationalVelocity = new Vector3((float)(axis.x * spinrate), (float)(axis.y * spinrate), (float)(axis.z * spinrate)); | ||
3163 | m_host.AngularVelocity = new Vector3((float)(axis.x * spinrate), (float)(axis.y * spinrate), (float)(axis.z * spinrate)); | 3162 | m_host.AngularVelocity = new Vector3((float)(axis.x * spinrate), (float)(axis.y * spinrate), (float)(axis.z * spinrate)); |
3164 | m_host.ScheduleTerseUpdate(); | 3163 | m_host.ScheduleTerseUpdate(); |
3165 | m_host.SendTerseUpdateToAllClients(); | 3164 | m_host.SendTerseUpdateToAllClients(); |
@@ -3817,7 +3816,7 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api | |||
3817 | { | 3816 | { |
3818 | case 1: // DATA_ONLINE (0|1) | 3817 | case 1: // DATA_ONLINE (0|1) |
3819 | // TODO: implement fetching of this information | 3818 | // TODO: implement fetching of this information |
3820 | if (userProfile.CurrentAgent.AgentOnline) | 3819 | if (userProfile.CurrentAgent!=null && userProfile.CurrentAgent.AgentOnline) |
3821 | reply = "1"; | 3820 | reply = "1"; |
3822 | else | 3821 | else |
3823 | reply = "0"; | 3822 | reply = "0"; |