diff options
| author | Tom | 2011-09-07 09:42:18 -0700 |
|---|---|---|
| committer | Tom | 2011-09-07 09:42:18 -0700 |
| commit | 03f6734f4367b08e2b181ed68bc80b885e76148f (patch) | |
| tree | fa8550771d3b5eb1a0315f107801b332f78bede5 /OpenSim/Region/ScriptEngine/Shared | |
| parent | Now merging the core changes. (diff) | |
| download | opensim-SC_OLD-03f6734f4367b08e2b181ed68bc80b885e76148f.zip opensim-SC_OLD-03f6734f4367b08e2b181ed68bc80b885e76148f.tar.gz opensim-SC_OLD-03f6734f4367b08e2b181ed68bc80b885e76148f.tar.bz2 opensim-SC_OLD-03f6734f4367b08e2b181ed68bc80b885e76148f.tar.xz | |
First set of merge fixes
Diffstat (limited to 'OpenSim/Region/ScriptEngine/Shared')
| -rw-r--r-- | OpenSim/Region/ScriptEngine/Shared/Api/Implementation/OSSL_Api.cs | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/OpenSim/Region/ScriptEngine/Shared/Api/Implementation/OSSL_Api.cs b/OpenSim/Region/ScriptEngine/Shared/Api/Implementation/OSSL_Api.cs index 9ec8a42..0c1da47 100644 --- a/OpenSim/Region/ScriptEngine/Shared/Api/Implementation/OSSL_Api.cs +++ b/OpenSim/Region/ScriptEngine/Shared/Api/Implementation/OSSL_Api.cs | |||
| @@ -2166,8 +2166,7 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api | |||
| 2166 | UUID x = module.CreateNPC(firstname, | 2166 | UUID x = module.CreateNPC(firstname, |
| 2167 | lastname, | 2167 | lastname, |
| 2168 | new Vector3((float) position.x, (float) position.y, (float) position.z), | 2168 | new Vector3((float) position.x, (float) position.y, (float) position.z), |
| 2169 | World, | 2169 | World,appearance); |
| 2170 | appearance); | ||
| 2171 | 2170 | ||
| 2172 | return new LSL_Key(x.ToString()); | 2171 | return new LSL_Key(x.ToString()); |
| 2173 | } | 2172 | } |