Merge pull request #1745 from secondlife/project/gltf_development

move project/gltf development to develop

1 files changed, 27 insertions, 27 deletions

diff --git a/indra/newview/lldrawable.h b/indra/newview/lldrawable.h
index 726667813a..a7ac9da618 100644
--- a/indra/newview/lldrawable.h
+++ b/indra/newview/lldrawable.h
@@ -84,13 +84,13 @@ public:
     LLDrawable(LLViewerObject *vobj, bool new_entry = false);
 
     void markDead();            // Mark this drawable as dead
-    BOOL isDead() const         { return isState(DEAD); }
-    BOOL isNew() const          { return !isState(BUILT); }
-    BOOL isUnload() const       { return isState(FOR_UNLOAD); }
+    bool isDead() const         { return isState(DEAD); }
+    bool isNew() const          { return !isState(BUILT); }
+    bool isUnload() const       { return isState(FOR_UNLOAD); }
 
-    BOOL isLight() const;
+    bool isLight() const;
 
-    virtual void setVisible(LLCamera& camera_in, std::vector<LLDrawable*>* results = NULL, BOOL for_select = FALSE);
+    virtual void setVisible(LLCamera& camera_in, std::vector<LLDrawable*>* results = NULL, bool for_select = false);
 
     LLSpatialGroup* getSpatialGroup()const          {return (LLSpatialGroup*)getGroup();}
     LLViewerRegion* getRegion()               const { return mVObjp->getRegion(); }
@@ -116,20 +116,20 @@ public:
     LLXformMatrix*      getXform() { return &mXform; }
 
     U32                 getState()           const { return mState; }
-    BOOL                isState   (U32 bits) const { return ((mState & bits) != 0); }
+    bool                isState   (U32 bits) const { return ((mState & bits) != 0); }
     void                setState  (U32 bits)       { mState |= bits; }
     void                clearState(U32 bits)       { mState &= ~bits; }
 
-    BOOL                isAvatar()  const           { return mVObjp.notNull() && mVObjp->isAvatar(); }
-    BOOL                isRoot() const              { return !mParent || mParent->isAvatar(); }
+    bool                isAvatar()  const           { return mVObjp.notNull() && mVObjp->isAvatar(); }
+    bool                isRoot() const              { return !mParent || mParent->isAvatar(); }
     LLDrawable*         getRoot();
-    BOOL                isSpatialRoot() const       { return !mParent || mParent->isAvatar(); }
-    virtual BOOL        isSpatialBridge() const     { return FALSE; }
+    bool                isSpatialRoot() const       { return !mParent || mParent->isAvatar(); }
+    virtual bool        isSpatialBridge() const     { return false; }
     virtual LLSpatialPartition* asPartition()       { return NULL; }
     LLDrawable*         getParent() const           { return mParent; }
 
     // must set parent through LLViewerObject::     ()
-    //BOOL                setParent(LLDrawable *parent);
+    //bool                setParent(LLDrawable *parent);
 
     inline LLFace*      getFace(const S32 i) const;
     inline S32          getNumFaces()        const;
@@ -151,32 +151,32 @@ public:
     void destroy();
 
     void update();
-    F32 updateXform(BOOL undamped);
+    F32 updateXform(bool undamped);
 
     virtual void makeActive();
-    /*virtual*/ void makeStatic(BOOL warning_enabled = TRUE);
+    /*virtual*/ void makeStatic(bool warning_enabled = true);
 
-    BOOL isActive() const                           { return isState(ACTIVE); }
-    BOOL isStatic() const                           { return !isActive(); }
-    BOOL isAnimating() const;
+    bool isActive() const                           { return isState(ACTIVE); }
+    bool isStatic() const                           { return !isActive(); }
+    bool isAnimating() const;
 
-    virtual BOOL updateMove();
+    virtual bool updateMove();
     virtual void movePartition();
 
     void updateTexture();
     void updateMaterial();
     virtual void updateDistance(LLCamera& camera, bool force_update);
-    BOOL updateGeometry();
+    bool updateGeometry();
     void updateFaceSize(S32 idx);
 
-    void updateSpecialHoverCursor(BOOL enabled);
+    void updateSpecialHoverCursor(bool enabled);
 
     virtual void shiftPos(const LLVector4a &shift_vector);
 
     S32 getGeneration() const                   { return mGeneration; }
 
-    BOOL getLit() const                         { return isState(UNLIT) ? FALSE : TRUE; }
-    void setLit(BOOL lit)                       { lit ? clearState(UNLIT) : setState(UNLIT); }
+    bool getLit() const                         { return !isState(UNLIT); }
+    void setLit(bool lit)                       { lit ? clearState(UNLIT) : setState(UNLIT); }
 
     bool isVisible() const;
     bool isRecentlyVisible() const;
@@ -195,7 +195,7 @@ public:
     virtual void updateBinRadius();
 
     void setRenderType(S32 type)                { mRenderType = type; }
-    BOOL isRenderType(S32 type)                 { return mRenderType == type; }
+    bool isRenderType(S32 type)                 { return mRenderType == type; }
     S32  getRenderType()                        { return mRenderType; }
 
     // Debugging methods
@@ -214,10 +214,10 @@ public:
 
 protected:
     ~LLDrawable() { destroy(); }
-    void moveUpdatePipeline(BOOL moved);
+    void moveUpdatePipeline(bool moved);
     void updatePartition();
-    BOOL updateMoveDamped();
-    BOOL updateMoveUndamped();
+    bool updateMoveDamped();
+    bool updateMoveUndamped();
 
 public:
     friend class LLPipeline;
@@ -244,11 +244,11 @@ public:
         {
             if (lhs->isVisible() && !rhs->isVisible())
             {
-                return TRUE; //visible things come first
+                return true; //visible things come first
             }
             else if (!lhs->isVisible() && rhs->isVisible())
             {
-                return FALSE; //rhs is visible, comes first
+                return false; //rhs is visible, comes first
             }
 
             return lhs->mDistanceWRTCamera < rhs->mDistanceWRTCamera; // farthest = last