diff options
| author | Erik Kundiman <erik@megapahit.org> | 2025-08-08 07:30:46 +0800 |
|---|---|---|
| committer | Erik Kundiman <erik@megapahit.org> | 2025-08-08 07:37:27 +0800 |
| commit | cfc4f075a82f9dc1156fce6994083143de6727a8 (patch) | |
| tree | 2948ea5c6ebfbbc15721a2838804d6a766742887 /indra/newview/llfloaterpreference.cpp | |
| parent | 73fdef6693017f1160875d1f7a79875945df3929 (diff) | |
| parent | 55f1c8b9797836c9816528bb5b772eb83b083b50 (diff) | |
Merge tag 'Second_Life_Release#55f1c8b9-2025.06' into 2025.06
Diffstat (limited to 'indra/newview/llfloaterpreference.cpp')
| -rw-r--r-- | indra/newview/llfloaterpreference.cpp | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/indra/newview/llfloaterpreference.cpp b/indra/newview/llfloaterpreference.cpp index 36a68a7017..dc5346634e 100644 --- a/indra/newview/llfloaterpreference.cpp +++ b/indra/newview/llfloaterpreference.cpp @@ -528,6 +528,10 @@ bool LLFloaterPreference::postBuild() getChild<LLComboBox>("language_combobox")->add("System default", LLSD("default"), ADD_TOP, true); } +#ifndef LL_DISCORD + getChild<LLTabContainer>("privacy_tab_container")->childDisable("privacy_preferences_discord"); +#endif + return true; } |