diff options
| author | Steven Bennetts <steve@lindenlab.com> | 2009-05-08 07:43:08 +0000 |
|---|---|---|
| committer | Steven Bennetts <steve@lindenlab.com> | 2009-05-08 07:43:08 +0000 |
| commit | a4000c3744e42fcbb638e742f3b63fa31a0dee15 (patch) | |
| tree | 7f472c30e65bbfa04ee9bc06631a1af305cc31fb /indra/newview/llfloaterpostprocess.h | |
| parent | 6c4cadbb04d633ad7b762058bdeba6e1f650dafd (diff) | |
merge trunk@116587 skinning-7@119389 -> viewer-2.0.0-skinning-7
Diffstat (limited to 'indra/newview/llfloaterpostprocess.h')
| -rw-r--r-- | indra/newview/llfloaterpostprocess.h | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/indra/newview/llfloaterpostprocess.h b/indra/newview/llfloaterpostprocess.h index 08a3618c2b..68e6d1e244 100644 --- a/indra/newview/llfloaterpostprocess.h +++ b/indra/newview/llfloaterpostprocess.h @@ -53,7 +53,7 @@ public: LLFloaterPostProcess(); virtual ~LLFloaterPostProcess(); - + /*virtual*/ BOOL postBuild(); /// one and one instance only static LLFloaterPostProcess* instance(); @@ -66,7 +66,7 @@ public: static void onColorControlIMoved(LLUICtrl* ctrl, void* userData); static void onLoadEffect(void* userData); static void onSaveEffect(void* userData); - static void onChangeEffectName(LLUICtrl* ctrl, void * userData); + void onChangeEffectName(LLUICtrl* ctrl); /// prompts a user when overwriting an effect static bool saveAlertCallback(const LLSD& notification, const LLSD& response); |