Showing the changes to interface/src/Application.cpp (1 of 6 files). Show all
Unified · Split
| @@ -548,7 +548,6 @@ const float DEFAULT_HMD_TABLET_SCALE_PERCENT = 100.0f; · 547 unmodified lines | ||
| 548 | 548 | const float DEFAULT_DESKTOP_TABLET_SCALE_PERCENT = 75.0f; |
| 549 | 549 | const bool DEFAULT_DESKTOP_TABLET_BECOMES_TOOLBAR = true; |
| 550 | 550 | const bool DEFAULT_HMD_TABLET_BECOMES_TOOLBAR = false; |
| 551 | −const bool DEFAULT_TABLET_VISIBLE_TO_OTHERS = false; | |
| 552 | 551 | const bool DEFAULT_PREFER_AVATAR_FINGER_OVER_STYLUS = true; |
| 553 | 552 | |
| 554 | 553 | Application::Application(int& argc, char** argv, QElapsedTimer& startupTimer, bool runServer, QString runServerPathOption) : |
| @@ -571,7 +570,6 @@ Application::Application(int& argc, char** argv, QElapsedTimer& startupTimer, bo · 16 unmodified lines | ||
| 571 | 570 | _desktopTabletScale("desktopTabletScale", DEFAULT_DESKTOP_TABLET_SCALE_PERCENT), |
| 572 | 571 | _desktopTabletBecomesToolbarSetting("desktopTabletBecomesToolbar", DEFAULT_DESKTOP_TABLET_BECOMES_TOOLBAR), |
| 573 | 572 | _hmdTabletBecomesToolbarSetting("hmdTabletBecomesToolbar", DEFAULT_HMD_TABLET_BECOMES_TOOLBAR), |
| 574 | − _tabletVisibleToOthersSetting("tabletVisibleToOthers", DEFAULT_TABLET_VISIBLE_TO_OTHERS), | |
| 575 | 573 | _preferAvatarFingerOverStylusSetting("preferAvatarFingerOverStylus", DEFAULT_PREFER_AVATAR_FINGER_OVER_STYLUS), |
| 576 | 574 | _constrainToolbarPosition("toolbar/constrainToolbarToCenterX", true), |
| 577 | 575 | _scaleMirror(1.0f), |
| @@ -2359,11 +2357,6 @@ void Application::setHmdTabletBecomesToolbarSetting(bool value) { · 1781 unmodified lines | ||
| 2359 | 2357 | updateSystemTabletMode(); |
| 2360 | 2358 | } |
| 2361 | 2359 | |
| 2362 | −void Application::setTabletVisibleToOthersSetting(bool value) { | |
| 2363 | − _tabletVisibleToOthersSetting.set(value); | |
| 2364 | − updateSystemTabletMode(); | |
| 2365 | −} | |
| 2366 | − | |
| 2367 | 2360 | void Application::setPreferAvatarFingerOverStylus(bool value) { |
| 2368 | 2361 | _preferAvatarFingerOverStylusSetting.set(value); |
| 2369 | 2362 | } |
| @@ -3788,7 +3781,6 @@ void Application::loadSettings() { · 1418 unmodified lines | ||
| 3788 | 3781 | } |
| 3789 | 3782 | |
| 3790 | 3783 | getMyAvatar()->loadData(); |
| 3791 | − setTabletVisibleToOthersSetting(false); | |
| 3792 | 3784 | _settingsLoaded = true; |
| 3793 | 3785 | } |
| 3794 | 3786 | |