summaryrefslogtreecommitdiff
path: root/indra/newview/pipeline.h
diff options
context:
space:
mode:
authorDon Kjer <don@lindenlab.com>2011-04-01 23:37:30 +0000
committerDon Kjer <don@lindenlab.com>2011-04-01 23:37:30 +0000
commitd292053c04e6adfd48be0484dd5a8a07b48e0541 (patch)
treebb8814069df178e2bcae041f2c3e9b11338492db /indra/newview/pipeline.h
parentf2bb81d17660054697ed984afc0e3f8d90f77eda (diff)
parent1664c9dc678f7aca9c2bbf38d28e00550e03c4dd (diff)
Merge with viewer-development
Diffstat (limited to 'indra/newview/pipeline.h')
-rw-r--r--indra/newview/pipeline.h5
1 files changed, 5 insertions, 0 deletions
diff --git a/indra/newview/pipeline.h b/indra/newview/pipeline.h
index e99b0d71e3..92ae40ebb0 100644
--- a/indra/newview/pipeline.h
+++ b/indra/newview/pipeline.h
@@ -312,6 +312,10 @@ public:
static void toggleRenderSoundBeacons(void* data);
static BOOL getRenderSoundBeacons(void* data);
+ static void setRenderMOAPBeacons(BOOL val);
+ static void toggleRenderMOAPBeacons(void * data);
+ static BOOL getRenderMOAPBeacons(void * data);
+
static void setRenderPhysicalBeacons(BOOL val);
static void toggleRenderPhysicalBeacons(void* data);
static BOOL getRenderPhysicalBeacons(void* data);
@@ -698,6 +702,7 @@ protected:
S32 mLightingDetail;
static BOOL sRenderPhysicalBeacons;
+ static BOOL sRenderMOAPBeacons;
static BOOL sRenderScriptedTouchBeacons;
static BOOL sRenderScriptedBeacons;
static BOOL sRenderParticleBeacons;