Merge branch 'master' into httptests

OpenSim/Framework/ISceneAgent.cs

@@ -56,7 +56,7 @@ namespace OpenSim.Framework
         bool IsChildAgent { get; }
 
         bool IsInTransit { get; }
-        bool isNPC { get;}
+        bool IsNPC { get;}
 
         bool Invulnerable { get; set; }
         /// <summary>
@@ -83,4 +83,4 @@ namespace OpenSim.Framework
         /// <remarks>Will be Vector3.Zero for a child agent.</remarks>
         Vector3 Lookat { get; }
     }
-}
+}