diff options
Diffstat (limited to 'indra/newview/llviewertexlayer.h')
| -rw-r--r-- | indra/newview/llviewertexlayer.h | 30 |
1 files changed, 15 insertions, 15 deletions
diff --git a/indra/newview/llviewertexlayer.h b/indra/newview/llviewertexlayer.h index 0ced450299..6f95fcac6f 100644 --- a/indra/newview/llviewertexlayer.h +++ b/indra/newview/llviewertexlayer.h @@ -47,12 +47,12 @@ public: virtual ~LLViewerTexLayerSet(); /*virtual*/void requestUpdate(); - BOOL isLocalTextureDataAvailable() const; - BOOL isLocalTextureDataFinal() const; + bool isLocalTextureDataAvailable() const; + bool isLocalTextureDataFinal() const; void updateComposite(); /*virtual*/void createComposite(); - void setUpdatesEnabled(BOOL b); - BOOL getUpdatesEnabled() const { return mUpdatesEnabled; } + void setUpdatesEnabled(bool b); + bool getUpdatesEnabled() const { return mUpdatesEnabled; } LLVOAvatarSelf* getAvatar(); const LLVOAvatarSelf* getAvatar() const; @@ -60,7 +60,7 @@ public: const LLViewerTexLayerSetBuffer* getViewerComposite() const; private: - BOOL mUpdatesEnabled; + bool mUpdatesEnabled; }; @@ -79,7 +79,7 @@ public: public: /*virtual*/ S8 getType() const; - BOOL isInitialized(void) const; + bool isInitialized(void) const; static void dumpTotalByteCount(); const std::string dumpTextureInfo() const; virtual void restoreGLTexture(); @@ -95,8 +95,8 @@ private: // Tex Layer Render //-------------------------------------------------------------------- virtual void preRenderTexLayerSet(); - virtual void midRenderTexLayerSet(BOOL success); - virtual void postRenderTexLayerSet(BOOL success); + virtual void midRenderTexLayerSet(bool success); + virtual void postRenderTexLayerSet(bool success); virtual S32 getCompositeOriginX() const { return getOriginX(); } virtual S32 getCompositeOriginY() const { return getOriginY(); } virtual S32 getCompositeWidth() const { return getFullWidth(); } @@ -106,25 +106,25 @@ private: // Dynamic Texture Interface //-------------------------------------------------------------------- public: - /*virtual*/ BOOL needsRender(); + /*virtual*/ bool needsRender(); protected: // Pass these along for tex layer rendering. - virtual void preRender(BOOL clear_depth) { preRenderTexLayerSet(); } - virtual void postRender(BOOL success) { postRenderTexLayerSet(success); } - virtual BOOL render() { return renderTexLayerSet(mBoundTarget); } + virtual void preRender(bool clear_depth) { preRenderTexLayerSet(); } + virtual void postRender(bool success) { postRenderTexLayerSet(success); } + virtual bool render() { return renderTexLayerSet(mBoundTarget); } //-------------------------------------------------------------------- // Updates //-------------------------------------------------------------------- public: void requestUpdate(); - BOOL requestUpdateImmediate(); + bool requestUpdateImmediate(); protected: - BOOL isReadyToUpdate() const; + bool isReadyToUpdate() const; void doUpdate(); void restartUpdateTimer(); private: - BOOL mNeedsUpdate; // Whether we need to locally update our baked textures + bool mNeedsUpdate; // Whether we need to locally update our baked textures U32 mNumLowresUpdates; // Number of times we've locally updated with lowres version of our baked textures LLFrameTimer mNeedsUpdateTimer; // Tracks time since update was requested and performed. }; |