diff options
| author | MW | 2008-06-29 12:33:45 +0000 |
|---|---|---|
| committer | MW | 2008-06-29 12:33:45 +0000 |
| commit | 037b31f9dbf446ffb770ed465e9c4b46600f43fa (patch) | |
| tree | 5768c828def615418a234d4f99852f8d6982d7d1 /OpenSim/Region/ScriptEngine | |
| parent | patch and files from mantis #1630, Thanks Melanie (diff) | |
| download | opensim-SC_OLD-037b31f9dbf446ffb770ed465e9c4b46600f43fa.zip opensim-SC_OLD-037b31f9dbf446ffb770ed465e9c4b46600f43fa.tar.gz opensim-SC_OLD-037b31f9dbf446ffb770ed465e9c4b46600f43fa.tar.bz2 opensim-SC_OLD-037b31f9dbf446ffb770ed465e9c4b46600f43fa.tar.xz | |
patch from mantis #1632, thanks Melanie
Diffstat (limited to 'OpenSim/Region/ScriptEngine')
| -rw-r--r-- | OpenSim/Region/ScriptEngine/Common/LSL_BuiltIn_Commands.cs | 2 | ||||
| -rw-r--r-- | OpenSim/Region/ScriptEngine/Shared/Api/Implementation/LSL_Api.cs | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/OpenSim/Region/ScriptEngine/Common/LSL_BuiltIn_Commands.cs b/OpenSim/Region/ScriptEngine/Common/LSL_BuiltIn_Commands.cs index 69235c4..b65174e 100644 --- a/OpenSim/Region/ScriptEngine/Common/LSL_BuiltIn_Commands.cs +++ b/OpenSim/Region/ScriptEngine/Common/LSL_BuiltIn_Commands.cs | |||
| @@ -1993,7 +1993,7 @@ namespace OpenSim.Region.ScriptEngine.Common | |||
| 1993 | // need the magnitude later | 1993 | // need the magnitude later |
| 1994 | float velmag = (float)Util.GetMagnitude(llvel); | 1994 | float velmag = (float)Util.GetMagnitude(llvel); |
| 1995 | 1995 | ||
| 1996 | SceneObjectGroup new_group = World.RezObject(inv.Value, llpos, new LLQuaternion((float)rot.x, (float)rot.y, (float)rot.z, (float)rot.s), llvel, param); | 1996 | SceneObjectGroup new_group = World.RezObject(m_host, inv.Value, llpos, new LLQuaternion((float)rot.x, (float)rot.y, (float)rot.z, (float)rot.s), llvel, param); |
| 1997 | 1997 | ||
| 1998 | // If either of these are null, then there was an unknown error. | 1998 | // If either of these are null, then there was an unknown error. |
| 1999 | if (new_group == null) | 1999 | if (new_group == null) |
diff --git a/OpenSim/Region/ScriptEngine/Shared/Api/Implementation/LSL_Api.cs b/OpenSim/Region/ScriptEngine/Shared/Api/Implementation/LSL_Api.cs index 0320857..235b657 100644 --- a/OpenSim/Region/ScriptEngine/Shared/Api/Implementation/LSL_Api.cs +++ b/OpenSim/Region/ScriptEngine/Shared/Api/Implementation/LSL_Api.cs | |||
| @@ -1844,7 +1844,7 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api | |||
| 1844 | // need the magnitude later | 1844 | // need the magnitude later |
| 1845 | float velmag = (float)Util.GetMagnitude(llvel); | 1845 | float velmag = (float)Util.GetMagnitude(llvel); |
| 1846 | 1846 | ||
| 1847 | SceneObjectGroup new_group = World.RezObject(inv.Value, llpos, new LLQuaternion((float)rot.x, (float)rot.y, (float)rot.z, (float)rot.s), llvel, param); | 1847 | SceneObjectGroup new_group = World.RezObject(m_host, inv.Value, llpos, new LLQuaternion((float)rot.x, (float)rot.y, (float)rot.z, (float)rot.s), llvel, param); |
| 1848 | 1848 | ||
| 1849 | // If either of these are null, then there was an unknown error. | 1849 | // If either of these are null, then there was an unknown error. |
| 1850 | if (new_group == null) | 1850 | if (new_group == null) |