Merge pull request #2856 from secondlife/marchcat/c-develop

Develop → Maint C sync

1 files changed, 7 insertions, 9 deletions

diff --git a/indra/llappearance/lllocaltextureobject.h b/indra/llappearance/lllocaltextureobject.h
index f981e73789..a1b1178dee 100644
--- a/indra/llappearance/lllocaltextureobject.h
+++ b/indra/llappearance/lllocaltextureobject.h
@@ -27,8 +27,6 @@
 #ifndef LL_LOCALTEXTUREOBJECT_H
 #define LL_LOCALTEXTUREOBJECT_H
 
-#include <boost/shared_ptr.hpp>
-
 #include "llpointer.h"
 #include "llgltexture.h"
 
@@ -53,17 +51,17 @@ public:
     U32         getNumTexLayers() const;
     LLUUID      getID() const;
     S32         getDiscard() const;
-    BOOL        getBakedReady() const;
+    bool        getBakedReady() const;
 
     void setImage(LLGLTexture* new_image);
-    BOOL setTexLayer(LLTexLayer *new_tex_layer, U32 index);
-    BOOL addTexLayer(LLTexLayer *new_tex_layer, LLWearable *wearable);
-    BOOL addTexLayer(LLTexLayerTemplate *new_tex_layer, LLWearable *wearable);
-    BOOL removeTexLayer(U32 index);
+    bool setTexLayer(LLTexLayer *new_tex_layer, U32 index);
+    bool addTexLayer(LLTexLayer *new_tex_layer, LLWearable *wearable);
+    bool addTexLayer(LLTexLayerTemplate *new_tex_layer, LLWearable *wearable);
+    bool removeTexLayer(U32 index);
 
     void setID(LLUUID new_id);
     void setDiscard(S32 new_discard);
-    void setBakedReady(BOOL ready);
+    void setBakedReady(bool ready);
 
 protected:
 
@@ -78,7 +76,7 @@ private:
 
     LLUUID          mID;
 
-    BOOL mIsBakedReady;
+    bool mIsBakedReady;
     S32 mDiscard;
 };