diff options
| author | Loren Shih <seraph@lindenlab.com> | 2011-03-31 16:40:57 -0400 |
|---|---|---|
| committer | Loren Shih <seraph@lindenlab.com> | 2011-03-31 16:40:57 -0400 |
| commit | 8ccf3fbe3ba49c47da85527bcf6cdbded6fa9183 (patch) | |
| tree | edddbe8910b253d803d754ef0a87c95b74ba3adc /indra/newview/pipeline.h | |
| parent | 3a08499572250b46d061106298e2d2777276efc1 (diff) | |
| parent | 5c3ae68299f79f3a705fa4b3e9cd262b56695318 (diff) | |
Automated merge up from viewer-development into mesh-development
Diffstat (limited to 'indra/newview/pipeline.h')
| -rw-r--r-- | indra/newview/pipeline.h | 5 |
1 files changed, 5 insertions, 0 deletions
diff --git a/indra/newview/pipeline.h b/indra/newview/pipeline.h index be58af947c..074c1742e2 100644 --- a/indra/newview/pipeline.h +++ b/indra/newview/pipeline.h @@ -331,6 +331,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); @@ -728,6 +732,7 @@ protected: S32 mLightingDetail; static BOOL sRenderPhysicalBeacons; + static BOOL sRenderMOAPBeacons; static BOOL sRenderScriptedTouchBeacons; static BOOL sRenderScriptedBeacons; static BOOL sRenderParticleBeacons; |