Merge pull request #1745 from secondlife/project/gltf_development

move project/gltf development to develop

1 files changed, 5 insertions, 4 deletions

diff --git a/indra/newview/llcontrolavatar.h b/indra/newview/llcontrolavatar.h
index ca98659ecd..0d94fe08ee 100644
--- a/indra/newview/llcontrolavatar.h
+++ b/indra/newview/llcontrolavatar.h
@@ -69,9 +69,9 @@ public:
     virtual LLViewerObject* lineSegmentIntersectRiggedAttachments(
         const LLVector4a& start, const LLVector4a& end,
         S32 face = -1,                    // which face to check, -1 = ALL_SIDES
-        BOOL pick_transparent = FALSE,
-        BOOL pick_rigged = FALSE,
-        BOOL pick_unselectable = TRUE,
+        bool pick_transparent = false,
+        bool pick_rigged = false,
+        bool pick_unselectable = true,
         S32* face_hit = NULL,             // which face was hit
         LLVector4a* intersection = NULL,   // return the intersection point
         LLVector2* tex_coord = NULL,      // return the texture coordinates of the intersection point
@@ -84,7 +84,8 @@ public:
 
     virtual bool shouldRenderRigged() const;
 
-    virtual BOOL isImpostor();
+    virtual bool isImpostor();
+    virtual bool isBuddy() const { return false; }
 
     bool mPlaying;