diff options
| author | Richard Linden <none@none> | 2011-04-01 16:42:46 -0700 |
|---|---|---|
| committer | Richard Linden <none@none> | 2011-04-01 16:42:46 -0700 |
| commit | 88c5554a288d1785aa391dc5ff7b7897a7a724a9 (patch) | |
| tree | 0305d5ce1f0bb5e544cd75275a137b372a08293d /indra/newview/pipeline.h | |
| parent | 774b9ac9f9f87af65a7356d7f9a25e204428d4aa (diff) | |
| parent | 453b0c700a8712f7ff79434772296a487d38184a (diff) | |
Automated merge with ssh://hg.lindenlab.com/richard/viewer-social-2
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; |