diff options
| author | Melanie | 2012-04-08 13:18:03 +0200 |
|---|---|---|
| committer | Melanie | 2012-04-08 13:18:03 +0200 |
| commit | 6b5b73bfae422c947796c0c7d0ead7a925cfd984 (patch) | |
| tree | 039d2c4936b3008dedb6b63d57905bbe42b38785 /OpenSim | |
| parent | Merge branch 'master' into careminster (diff) | |
| download | opensim-SC_OLD-6b5b73bfae422c947796c0c7d0ead7a925cfd984.zip opensim-SC_OLD-6b5b73bfae422c947796c0c7d0ead7a925cfd984.tar.gz opensim-SC_OLD-6b5b73bfae422c947796c0c7d0ead7a925cfd984.tar.bz2 opensim-SC_OLD-6b5b73bfae422c947796c0c7d0ead7a925cfd984.tar.xz | |
Fix a LSL merge artefact
Diffstat (limited to 'OpenSim')
| -rw-r--r-- | OpenSim/Region/ScriptEngine/Shared/Api/Implementation/LSL_Api.cs | 12 |
1 files changed, 2 insertions, 10 deletions
diff --git a/OpenSim/Region/ScriptEngine/Shared/Api/Implementation/LSL_Api.cs b/OpenSim/Region/ScriptEngine/Shared/Api/Implementation/LSL_Api.cs index 7cf284d..e71f027 100644 --- a/OpenSim/Region/ScriptEngine/Shared/Api/Implementation/LSL_Api.cs +++ b/OpenSim/Region/ScriptEngine/Shared/Api/Implementation/LSL_Api.cs | |||
| @@ -2280,20 +2280,12 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api | |||
| 2280 | } | 2280 | } |
| 2281 | else | 2281 | else |
| 2282 | { | 2282 | { |
| 2283 | if (part.IsRoot) | 2283 | if (part.ParentGroup.IsAttachment) |
| 2284 | { | 2284 | pos = part.AttachedPos; |
| 2285 | return new LSL_Vector(part.AttachedPos.X, | ||
| 2286 | part.AttachedPos.Y, | ||
| 2287 | part.AttachedPos.Z); | ||
| 2288 | } | ||
| 2289 | else | 2285 | else |
| 2290 | { | ||
| 2291 | pos = part.AbsolutePosition; | 2286 | pos = part.AbsolutePosition; |
| 2292 | } | ||
| 2293 | } | 2287 | } |
| 2294 | 2288 | ||
| 2295 | // m_log.DebugFormat("[LSL API]: Returning {0} in GetPartLocalPos()", pos); | ||
| 2296 | |||
| 2297 | return new LSL_Vector(pos.X, pos.Y, pos.Z); | 2289 | return new LSL_Vector(pos.X, pos.Y, pos.Z); |
| 2298 | } | 2290 | } |
| 2299 | 2291 | ||