From 168d177197bd7558bbe0ca13d01c984ad8638da7 Mon Sep 17 00:00:00 2001
From: Callum Prentice <callum@lindenlab.com>
Date: Tue, 9 Mar 2021 14:39:51 -0800
Subject: This set of changes reverts the merge with master (git revert
c83e740) and results in a version of the DRTVWR-519 that matches what was
presemt before it was deployed as a release viewer *plus* 3 small fixes from
Maxim (See commits). This branch can now be used for additional fixes before
eventually being used to release D-519 as normal
---
indra/newview/llfloaterpreference.h | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
(limited to 'indra/newview/llfloaterpreference.h')
diff --git a/indra/newview/llfloaterpreference.h b/indra/newview/llfloaterpreference.h
index 526214a617..f99d0e6150 100644
--- a/indra/newview/llfloaterpreference.h
+++ b/indra/newview/llfloaterpreference.h
@@ -107,7 +107,7 @@ protected:
void onBtnOK(const LLSD& userdata);
void onBtnCancel(const LLSD& userdata);
- void onClickClearCache(); // Clear viewer texture cache, vfs, and VO cache on next startup
+ void onClickClearCache(); // Clear viewer texture cache, file cache on next startup
void onClickBrowserClearCache(); // Clear web history and caches as well as viewer caches above
void onLanguageChange();
void onNotificationsChange(const std::string& OptionName);
--
cgit v1.2.3
From ef0b48ce5a918d30e4303c7b6eebec69c21ab8cf Mon Sep 17 00:00:00 2001
From: Mnikolenko Productengine <mnikolenko@productengine.com>
Date: Fri, 1 Oct 2021 14:09:12 +0300
Subject: SL-16119 Viewer should now direct IM 2 Email setting to web
---
indra/newview/llfloaterpreference.h | 5 ++---
1 file changed, 2 insertions(+), 3 deletions(-)
(limited to 'indra/newview/llfloaterpreference.h')
diff --git a/indra/newview/llfloaterpreference.h b/indra/newview/llfloaterpreference.h
index 4c8568c385..5ef2ca68d3 100644
--- a/indra/newview/llfloaterpreference.h
+++ b/indra/newview/llfloaterpreference.h
@@ -88,7 +88,7 @@ public:
/*virtual*/ void changed(const LLUUID& session_id, U32 mask) {};
// static data update, called from message handler
- static void updateUserInfo(const std::string& visibility, bool im_via_email, bool is_verified_email);
+ static void updateUserInfo(const std::string& visibility);
// refresh all the graphics preferences menus
static void refreshEnabledGraphics();
@@ -160,7 +160,7 @@ public:
void changeLogPath(const std::vector<std::string>& filenames, std::string proposed_name);
bool moveTranscriptsAndLog();
void enableHistory();
- void setPersonalInfo(const std::string& visibility, bool im_via_email, bool is_verified_email);
+ void setPersonalInfo(const std::string& visibility);
void refreshEnabledState();
void onCommitWindowedMode();
void refresh(); // Refresh enable/disable
@@ -206,7 +206,6 @@ private:
static std::string sSkin;
notifications_map mNotificationOptions;
bool mGotPersonalInfo;
- bool mOriginalIMViaEmail;
bool mLanguageChanged;
bool mAvatarDataInitialized;
std::string mPriorInstantMessageLogPath;
--
cgit v1.2.3