diff options
| author | Tofu Linden <tofu.linden@lindenlab.com> | 2010-06-15 14:39:18 +0100 |
|---|---|---|
| committer | Tofu Linden <tofu.linden@lindenlab.com> | 2010-06-15 14:39:18 +0100 |
| commit | 597a26aca1cf74117b60860aac0db0c82648f0e4 (patch) | |
| tree | 22be97e71bb5f1652c7c4ebd76e838c154fe7a32 /indra | |
| parent | 44647bd3b1a76c5771065eca608cf8f2db8546a2 (diff) | |
| parent | c8dea8b6e5db483b9f72dfeaa566b43560bfd349 (diff) | |
merge backout
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 00981d3c25..fa2a9873fc 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"); |