diff options
| author | Oz Linden <oz@lindenlab.com> | 2011-04-01 09:24:05 -0400 |
|---|---|---|
| committer | Oz Linden <oz@lindenlab.com> | 2011-04-01 09:24:05 -0400 |
| commit | 5e617d77f34f17f7a8f3677270f2738f857a60b8 (patch) | |
| tree | 921afb347a56f21c0ae7d5c34aae73d9ec96b1bb /indra/newview/pipeline.h | |
| parent | e0ca936fbf7411bcc1cdd935a50c5913db6a1cb9 (diff) | |
| parent | 8bc829220f8fc99180a1b1917220576a59de7339 (diff) | |
merge changes for storm-1072
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 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; |