diff --git a/interface/src/ui/PreferencesDialog.cpp b/interface/src/ui/PreferencesDialog.cpp
index 9c89826cb9..01e80ae5e5 100644
--- a/interface/src/ui/PreferencesDialog.cpp
+++ b/interface/src/ui/PreferencesDialog.cpp
@@ -136,6 +136,8 @@ void PreferencesDialog::loadPreferences() {
_skeletonURLString = myAvatar->getSkeletonModel().getURL().toString();
ui.skeletonURLEdit->setText(_skeletonURLString);
+
+ ui.sendDataCheckBox->setChecked(!menuInstance->isOptionChecked(MenuOption::DisableActivityLogger));
ui.snapshotLocationEdit->setText(menuInstance->getSnapshotsLocation());
@@ -201,6 +203,11 @@ void PreferencesDialog::savePreferences() {
myAvatar->sendIdentityPacket();
Application::getInstance()->bumpSettings();
}
+
+ if (!Menu::getInstance()->isOptionChecked(MenuOption::DisableActivityLogger)
+ != ui.sendDataCheckBox->isChecked()) {
+ Menu::getInstance()->triggerOption(MenuOption::DisableActivityLogger);
+ }
if (!ui.snapshotLocationEdit->text().isEmpty() && QDir(ui.snapshotLocationEdit->text()).exists()) {
Menu::getInstance()->setSnapshotsLocation(ui.snapshotLocationEdit->text());
diff --git a/interface/ui/preferencesDialog.ui b/interface/ui/preferencesDialog.ui
index 95678bf6f8..a1a794bc34 100644
--- a/interface/ui/preferencesDialog.ui
+++ b/interface/ui/preferencesDialog.ui
@@ -135,7 +135,7 @@ color: #0e7077
0
30
494
- 384
+ 361
@@ -155,8 +155,8 @@ color: #0e7077
0
0
- 600
- 1091
+ 494
+ 1456
@@ -790,6 +790,132 @@ padding: 10px;margin-top:10px
+ -
+
+
+
+ 0
+ 0
+
+
+
+
+ 0
+ 30
+
+
+
+
+ Arial
+ 16
+
+
+
+ color: #0e7077
+
+
+ Privacy
+
+
+ Qt::AlignBottom|Qt::AlignLeading|Qt::AlignLeft
+
+
+ 0
+
+
+ snapshotLocationEdit
+
+
+
+ -
+
+
+ 0
+
+
+ 10
+
+
+ 0
+
+
+ 10
+
+
-
+
+
+
+ Arial
+
+
+
+ color: rgb(51, 51, 51)
+
+
+ Send data
+
+
+ 15
+
+
+ maxVoxelsSpin
+
+
+
+ -
+
+
+
+ Arial
+
+
+
+ Qt::Horizontal
+
+
+
+ 40
+ 20
+
+
+
+
+ -
+
+
+
+ 0
+ 0
+
+
+
+
+ 32
+ 0
+
+
+
+
+ 0
+ 0
+
+
+
+
+
+
+
+ 32
+ 32
+
+
+
+ true
+
+
+
+
+
-
@@ -2073,8 +2199,8 @@ padding: 10px;margin-top:10px
close()
- 495
- 749
+ 966
+ 557
528
@@ -2089,8 +2215,8 @@ padding: 10px;margin-top:10px
accept()
- 504
- 749
+ 1070
+ 557
20