Merge branch 'master' into httptests

2 files changed, 5 insertions, 2 deletions

diff --git a/OpenSim/Framework/IClientAPI.cs b/OpenSim/Framework/IClientAPI.cs
index cafbd1f..f1290b9 100644
--- a/OpenSim/Framework/IClientAPI.cs
+++ b/OpenSim/Framework/IClientAPI.cs
@@ -1142,8 +1142,8 @@ namespace OpenSim.Framework
         void SendLayerData(float[] map);
         void SendLayerData(int px, int py, float[] map);
 
-        void SendWindData(Vector2[] windSpeeds);
-        void SendCloudData(float[] cloudCover);
+        void SendWindData(int version, Vector2[] windSpeeds);
+        void SendCloudData(int version, float[] cloudCover);
 
         /// <summary>
         /// Sent when an agent completes its movement into a region.
diff --git a/OpenSim/Framework/ISceneAgent.cs b/OpenSim/Framework/ISceneAgent.cs
index 1848b17..c8424e3 100644
--- a/OpenSim/Framework/ISceneAgent.cs
+++ b/OpenSim/Framework/ISceneAgent.cs
@@ -55,6 +55,9 @@ namespace OpenSim.Framework
         /// </summary>
         bool IsChildAgent { get; }
 
+        bool IsInTransit { get; }
+        bool isNPC { get;}
+
         bool Invulnerable { get; set; }
         /// <summary>
         /// Avatar appearance data.