diff options
| author | Melanie | 2012-06-29 22:11:49 +0100 |
|---|---|---|
| committer | Melanie | 2012-06-29 22:11:49 +0100 |
| commit | 05cf51cbbdb3f33bb4c532eefc24eb0a194ed378 (patch) | |
| tree | 5514845e589587a84a621bb6e576136d4869ad29 /OpenSim/Region/ScriptEngine/Shared/Helpers.cs | |
| parent | Revert "Mantis 5977 Corrections to llRegionSayTo" (diff) | |
| parent | Fix llRegionSayTo the right way (diff) | |
| download | opensim-SC_OLD-05cf51cbbdb3f33bb4c532eefc24eb0a194ed378.zip opensim-SC_OLD-05cf51cbbdb3f33bb4c532eefc24eb0a194ed378.tar.gz opensim-SC_OLD-05cf51cbbdb3f33bb4c532eefc24eb0a194ed378.tar.bz2 opensim-SC_OLD-05cf51cbbdb3f33bb4c532eefc24eb0a194ed378.tar.xz | |
Merge branch 'avination' into careminster
Conflicts:
OpenSim/Framework/Servers/HttpServer/PollServiceWorkerThread.cs
Diffstat (limited to 'OpenSim/Region/ScriptEngine/Shared/Helpers.cs')
| -rw-r--r-- | OpenSim/Region/ScriptEngine/Shared/Helpers.cs | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/OpenSim/Region/ScriptEngine/Shared/Helpers.cs b/OpenSim/Region/ScriptEngine/Shared/Helpers.cs index 7e7e278..5c9d30f 100644 --- a/OpenSim/Region/ScriptEngine/Shared/Helpers.cs +++ b/OpenSim/Region/ScriptEngine/Shared/Helpers.cs | |||
| @@ -197,6 +197,8 @@ namespace OpenSim.Region.ScriptEngine.Shared | |||
| 197 | presence.Velocity.Z); | 197 | presence.Velocity.Z); |
| 198 | 198 | ||
| 199 | Type = 0x01; // Avatar | 199 | Type = 0x01; // Avatar |
| 200 | if (presence.PresenceType == PresenceType.Npc) | ||
| 201 | Type = 0x20; | ||
| 200 | if (presence.Velocity != Vector3.Zero) | 202 | if (presence.Velocity != Vector3.Zero) |
| 201 | Type |= 0x02; // Active | 203 | Type |= 0x02; // Active |
| 202 | 204 | ||