diff options
| author | Diva Canto | 2010-06-14 11:54:40 -0700 |
|---|---|---|
| committer | Diva Canto | 2010-06-14 11:54:40 -0700 |
| commit | 462a0f24e914ebb2ee83c361bc2d8ee1b64066a2 (patch) | |
| tree | 53224deec076bc9186c508ed583bb80783cfa0ed /OpenSim/Region/ScriptEngine | |
| parent | Merge branch 'master' into 0.7-post-fixes (diff) | |
| parent | * Deleted duplicated migration that was failing anyway. (diff) | |
| download | opensim-SC-462a0f24e914ebb2ee83c361bc2d8ee1b64066a2.zip opensim-SC-462a0f24e914ebb2ee83c361bc2d8ee1b64066a2.tar.gz opensim-SC-462a0f24e914ebb2ee83c361bc2d8ee1b64066a2.tar.bz2 opensim-SC-462a0f24e914ebb2ee83c361bc2d8ee1b64066a2.tar.xz | |
Merge branch 'master' into 0.7-post-fixes
Diffstat (limited to '')
| -rw-r--r-- | OpenSim/Region/ScriptEngine/Shared/Api/Implementation/OSSL_Api.cs | 9 |
1 files changed, 3 insertions, 6 deletions
diff --git a/OpenSim/Region/ScriptEngine/Shared/Api/Implementation/OSSL_Api.cs b/OpenSim/Region/ScriptEngine/Shared/Api/Implementation/OSSL_Api.cs index cd6d3a3..01b64eb 100644 --- a/OpenSim/Region/ScriptEngine/Shared/Api/Implementation/OSSL_Api.cs +++ b/OpenSim/Region/ScriptEngine/Shared/Api/Implementation/OSSL_Api.cs | |||
| @@ -2218,12 +2218,9 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api | |||
| 2218 | { | 2218 | { |
| 2219 | if (avatar.IsChildAgent == false) | 2219 | if (avatar.IsChildAgent == false) |
| 2220 | { | 2220 | { |
| 2221 | if (avatar.PhysicsActor != null && avatar.PhysicsActor.Position != null) | 2221 | result.Add(avatar.UUID); |
| 2222 | { | 2222 | result.Add(avatar.AbsolutePosition); |
| 2223 | result.Add(avatar.UUID); | 2223 | result.Add(avatar.Name); |
| 2224 | result.Add(avatar.PhysicsActor.Position); | ||
| 2225 | result.Add(avatar.Name); | ||
| 2226 | } | ||
| 2227 | } | 2224 | } |
| 2228 | } | 2225 | } |
| 2229 | }); | 2226 | }); |