diff options
| author | Loren Shih <seraph@lindenlab.com> | 2010-06-08 10:50:34 -0400 |
|---|---|---|
| committer | Loren Shih <seraph@lindenlab.com> | 2010-06-08 10:50:34 -0400 |
| commit | 2f3019d670e8310f00fe4284a7fc09ee59c0f9bf (patch) | |
| tree | c1047159001bba55755900bfd85a95db72763c26 /indra | |
| parent | 68bd89ee4df63d62f695f34efe5060e5019b6fee (diff) | |
| parent | a35a7635c934284475a0379a90aa0e6356e6fcdb (diff) | |
automated merge
Diffstat (limited to 'indra')
| -rw-r--r-- | indra/newview/llfloatersnapshot.cpp | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/indra/newview/llfloatersnapshot.cpp b/indra/newview/llfloatersnapshot.cpp index fa2a9873fc..00981d3c25 100644 --- a/indra/newview/llfloatersnapshot.cpp +++ b/indra/newview/llfloatersnapshot.cpp @@ -1181,7 +1181,7 @@ public: static void onCommitCustomResolution(LLUICtrl *ctrl, void* data); static void onCommitSnapshot(LLFloaterSnapshot* view, LLSnapshotLivePreview::ESnapshotType type); static void onCommitProfilePic(LLFloaterSnapshot* view); - static void showAdvanced(LLFloaterSnapshot* view, const bool visible); + static void showAdvanced(LLFloaterSnapshot* view, const BOOL visible); static void resetSnapshotSizeOnUI(LLFloaterSnapshot *view, S32 width, S32 height) ; static BOOL checkImageSize(LLSnapshotLivePreview* previewp, S32& width, S32& height, BOOL isWidthChanged, S32 max_value); @@ -1649,7 +1649,7 @@ void LLFloaterSnapshot::Impl::onCommitLayerTypes(LLUICtrl* ctrl, void*data) } //static -void LLFloaterSnapshot::Impl::showAdvanced(LLFloaterSnapshot* view, const bool visible) +void LLFloaterSnapshot::Impl::showAdvanced(LLFloaterSnapshot* view, const BOOL visible) { LLPanel* advanced_panel = view->getChild<LLPanel>("snapshot_advanced"); |