diff options
| author | Oz Linden <oz@lindenlab.com> | 2012-05-08 15:51:56 -0400 |
|---|---|---|
| committer | Oz Linden <oz@lindenlab.com> | 2012-05-08 15:51:56 -0400 |
| commit | 95090c5d1e857130f7266b5753d3650d02e9386c (patch) | |
| tree | cff60656371883829dd7451ed4a1d3d09258b5ae /indra/newview/llfloatermediasettings.h | |
| parent | 5bf742895d882f1d7178c2b18a347bf485877a02 (diff) | |
| parent | d6569db3520f7e0ce2d93febb6f4e26b48c08a3d (diff) | |
merge changes for version 3.3.1
Diffstat (limited to 'indra/newview/llfloatermediasettings.h')
| -rw-r--r-- | indra/newview/llfloatermediasettings.h | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/indra/newview/llfloatermediasettings.h b/indra/newview/llfloatermediasettings.h index ecc55d2cbc..1d25530986 100644 --- a/indra/newview/llfloatermediasettings.h +++ b/indra/newview/llfloatermediasettings.h @@ -45,6 +45,7 @@ public: /*virtual*/ void onClose(bool app_quitting); static LLFloaterMediaSettings* getInstance(); + static bool instanceExists(); static void apply(); static void initValues( const LLSD& media_settings , bool editable); static void clearValues( bool editable); |