diff options
| author | Graham Madarasz <graham@lindenlab.com> | 2013-05-14 15:26:43 -0700 |
|---|---|---|
| committer | Graham Madarasz <graham@lindenlab.com> | 2013-05-14 15:26:43 -0700 |
| commit | a37bff8bf1add5afe154b25156d7ebe38ff9af31 (patch) | |
| tree | 1fa6995202747973935bd903b9bd2d31b89d8700 /indra/newview/pipeline.h | |
| parent | 8b6be5c667230c61d0de590de122fdef956150b7 (diff) | |
NORSPEC-103 reflect normal/spec UVs in face edit overlay display
Diffstat (limited to 'indra/newview/pipeline.h')
| -rwxr-xr-x | indra/newview/pipeline.h | 7 |
1 files changed, 7 insertions, 0 deletions
diff --git a/indra/newview/pipeline.h b/indra/newview/pipeline.h index 9b7d1d642c..4aee8f14d6 100755 --- a/indra/newview/pipeline.h +++ b/indra/newview/pipeline.h @@ -394,6 +394,7 @@ public: static void setRenderHighlights(BOOL val); static void toggleRenderHighlights(void* data); static BOOL getRenderHighlights(void* data); + static void setRenderHighlightTextureChannel(LLRender::eTexIndex channel); // sets which UV setup to display in highlight overlay static void updateRenderBump(); static void updateRenderDeferred(); @@ -401,6 +402,8 @@ public: static void throttleNewMemoryAllocation(BOOL disable); + + void addDebugBlip(const LLVector3& position, const LLColor4& color); void hidePermanentObjects( std::vector<U32>& restoreList ); @@ -847,6 +850,10 @@ public: static BOOL sRenderBeacons; static BOOL sRenderHighlight; + // Determines which set of UVs to use in highlight display + // + static LLRender::eTexIndex sRenderHighlightTextureChannel; + //debug use static U32 sCurRenderPoolType ; |