diff options
| author | UbitUmarov | 2016-10-08 01:27:02 +0100 |
|---|---|---|
| committer | UbitUmarov | 2016-10-08 01:27:02 +0100 |
| commit | 9843e3776ed4a613fb5682112e9e6b618cb14f9f (patch) | |
| tree | e6198111f4a331e331643ef00ddc29cc007d9af0 /OpenSim/Region/OptionalModules/World/NPC | |
| parent | recover regions main http server ssl suport. Using a PKCS12 cert file, and no... (diff) | |
| parent | remove attachment to event OnPreAgentUpdate that is doing nothing (diff) | |
| download | opensim-SC-9843e3776ed4a613fb5682112e9e6b618cb14f9f.zip opensim-SC-9843e3776ed4a613fb5682112e9e6b618cb14f9f.tar.gz opensim-SC-9843e3776ed4a613fb5682112e9e6b618cb14f9f.tar.bz2 opensim-SC-9843e3776ed4a613fb5682112e9e6b618cb14f9f.tar.xz | |
Merge branch 'master' into httptests
Diffstat (limited to 'OpenSim/Region/OptionalModules/World/NPC')
| -rw-r--r-- | OpenSim/Region/OptionalModules/World/NPC/NPCAvatar.cs | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/OpenSim/Region/OptionalModules/World/NPC/NPCAvatar.cs b/OpenSim/Region/OptionalModules/World/NPC/NPCAvatar.cs index 07413cf..1ad71ba 100644 --- a/OpenSim/Region/OptionalModules/World/NPC/NPCAvatar.cs +++ b/OpenSim/Region/OptionalModules/World/NPC/NPCAvatar.cs | |||
| @@ -724,9 +724,9 @@ namespace OpenSim.Region.OptionalModules.World.NPC | |||
| 724 | { | 724 | { |
| 725 | } | 725 | } |
| 726 | 726 | ||
| 727 | public virtual void SendWindData(Vector2[] windSpeeds) { } | 727 | public virtual void SendWindData(int version, Vector2[] windSpeeds) { } |
| 728 | 728 | ||
| 729 | public virtual void SendCloudData(float[] cloudCover) { } | 729 | public virtual void SendCloudData(int version, float[] cloudCover) { } |
| 730 | 730 | ||
| 731 | public virtual void MoveAgentIntoRegion(RegionInfo regInfo, Vector3 pos, Vector3 look) | 731 | public virtual void MoveAgentIntoRegion(RegionInfo regInfo, Vector3 pos, Vector3 look) |
| 732 | { | 732 | { |