diff options
author | Brad Payne (Vir Linden) <vir@lindenlab.com> | 2012-08-02 11:53:42 -0400 |
---|---|---|
committer | Brad Payne (Vir Linden) <vir@lindenlab.com> | 2012-08-02 11:53:42 -0400 |
commit | 86d33e21a73e1f9db5b88b7169e32070c488bb48 (patch) | |
tree | 6c09925f34719c43c543dc23c8095af7a2c392d9 /indra/newview/pipeline.h | |
parent | 22b1223ea7d68b27304cdd713f8e8b491b654060 (diff) | |
parent | b7555a3309bda8e9689627901051aa90fcb7be34 (diff) |
merge
Diffstat (limited to 'indra/newview/pipeline.h')
-rw-r--r-- | indra/newview/pipeline.h | 9 |
1 files changed, 8 insertions, 1 deletions
diff --git a/indra/newview/pipeline.h b/indra/newview/pipeline.h index d16d7d1169..47f3426cce 100644 --- a/indra/newview/pipeline.h +++ b/indra/newview/pipeline.h @@ -375,6 +375,12 @@ public: void addDebugBlip(const LLVector3& position, const LLColor4& color); + void hidePermanentObjects( std::vector<U32>& restoreList ); + void restorePermanentObjects( const std::vector<U32>& restoreList ); + void skipRenderingOfTerrain( BOOL flag ); + void hideObject( const LLUUID& id ); + void restoreHiddenObject( const LLUUID& id ); + private: void unloadShaders(); void addToQuickLookup( LLDrawPool* new_poolp ); @@ -383,7 +389,8 @@ private: void assertInitializedDoError(); bool assertInitialized() { const bool is_init = isInit(); if (!is_init) assertInitializedDoError(); return is_init; }; void connectRefreshCachedSettingsSafe(const std::string name); - + void hideDrawable( LLDrawable *pDrawable ); + void unhideDrawable( LLDrawable *pDrawable ); public: enum {GPU_CLASS_MAX = 3 }; |