From 154b30cbf3c6a32bad4908fb95c2b1cfaff0be72 Mon Sep 17 00:00:00 2001 From: Oz Linden Date: Thu, 2 Feb 2017 15:44:51 -0500 Subject: [PATCH 1/8] Added tag 5.0.1-release for changeset c9ce22950129 --- .hgtags | 1 + 1 file changed, 1 insertion(+) diff --git a/.hgtags b/.hgtags index 730e86e16a..797f517d84 100755 --- a/.hgtags +++ b/.hgtags @@ -522,3 +522,4 @@ e9d350764dfbf5a46229e627547ef5c1b1eeef00 4.0.2-release b280a1c797a3891e68dbc237e73de9cf19f426e9 4.1.1-release bfbba2244320dc2ae47758cd7edd8fa3b67dc756 4.1.2-release b41e1e7c7876f7656c505f552b5888b4e478f92b 5.0.0-release +c9ce2295012995e3cf5c57bcffcb4870b94c649f 5.0.1-release From 080744d8990e6b18a80858803a20a5ec87020d82 Mon Sep 17 00:00:00 2001 From: Oz Linden Date: Thu, 2 Feb 2017 15:44:52 -0500 Subject: [PATCH 2/8] increment viewer version to 5.0.2 --- indra/newview/VIEWER_VERSION.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/indra/newview/VIEWER_VERSION.txt b/indra/newview/VIEWER_VERSION.txt index 6b244dcd69..a1ef0cae18 100644 --- a/indra/newview/VIEWER_VERSION.txt +++ b/indra/newview/VIEWER_VERSION.txt @@ -1 +1 @@ -5.0.1 +5.0.2 From 08c41d52a9712fdbe3d781c097101ff28fe094d9 Mon Sep 17 00:00:00 2001 From: Ansariel Date: Fri, 3 Feb 2017 20:54:24 +0100 Subject: [PATCH 3/8] FIRE-20832: Fix Linux build --- indra/newview/fslightshare.h | 1 - 1 file changed, 1 deletion(-) diff --git a/indra/newview/fslightshare.h b/indra/newview/fslightshare.h index 05d66ea92a..e5b95ace0e 100644 --- a/indra/newview/fslightshare.h +++ b/indra/newview/fslightshare.h @@ -142,7 +142,6 @@ public: bool getState() { return mLightshareState; }; private: - friend class LLSingleton; static void processWater(LightsharePacket* ls_packet); static void processSky(LightsharePacket* ls_packet); void setState(bool has_lightshare); From eda726815a192c6607c285070ba3cd8535ac7292 Mon Sep 17 00:00:00 2001 From: Nicky Date: Fri, 3 Feb 2017 20:59:14 +0100 Subject: [PATCH 4/8] KDU 7.9.0 for OSX. --- autobuild.xml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/autobuild.xml b/autobuild.xml index 53633a2c4f..47e457f7fb 100644 --- a/autobuild.xml +++ b/autobuild.xml @@ -1375,9 +1375,9 @@ archive hash - e5a811fa7c9e5641869b58cd58a3e1c6 + 88ab0fb55e82f8cd3a75ee636def785a url - file:///opt/firestorm/kdu-7.8.0-darwin-201604022336-r52.tar.bz2 + file:///opt/firestorm/kdu-7.9.0-darwin-201702032052-r58.tar.bz2 name darwin From 4f2cd0da24a095aed52941fa0a0e76a41b636f2e Mon Sep 17 00:00:00 2001 From: Ansariel Date: Sat, 4 Feb 2017 01:10:02 +0100 Subject: [PATCH 5/8] FIRE-20833: Disabling mouse wheel zoom also disables scaling HUDs in build mode --- indra/newview/llagentcamera.cpp | 19 +++++++++++++------ 1 file changed, 13 insertions(+), 6 deletions(-) diff --git a/indra/newview/llagentcamera.cpp b/indra/newview/llagentcamera.cpp index 0bf2d502fb..0dcb83bce6 100644 --- a/indra/newview/llagentcamera.cpp +++ b/indra/newview/llagentcamera.cpp @@ -2105,17 +2105,18 @@ LLVector3 LLAgentCamera::getCameraOffsetInitial() //----------------------------------------------------------------------------- void LLAgentCamera::handleScrollWheel(S32 clicks) { - // Option to disable mouse wheel for camera zooming in/out static LLCachedControl FSDisableMouseWheelCameraZoom(gSavedSettings, "FSDisableMouseWheelCameraZoom"); - if(FSDisableMouseWheelCameraZoom) - { - return; - } - // if (mCameraMode == CAMERA_MODE_FOLLOW && getFocusOnAvatar()) { + // Option to disable mouse wheel for camera zooming in/out + if (FSDisableMouseWheelCameraZoom) + { + return; + } + // + if (!mFollowCam.getPositionLocked()) // not if the followCam position is locked in place { mFollowCam.zoom(clicks); @@ -2141,6 +2142,12 @@ void LLAgentCamera::handleScrollWheel(S32 clicks) F32 zoom_factor = (F32)pow(0.8, -clicks); cameraZoomIn(zoom_factor); } + // Option to disable mouse wheel for camera zooming in/out + else if (FSDisableMouseWheelCameraZoom) + { + return; + } + // else if (mFocusOnAvatar && (mCameraMode == CAMERA_MODE_THIRD_PERSON)) { // Camera focus and offset with CTRL/SHIFT + Scroll wheel From 0c1028c9a3efa0193114025f190d786395ff7a13 Mon Sep 17 00:00:00 2001 From: Mnikolenko Productengine Date: Tue, 24 Jan 2017 12:35:52 +0200 Subject: [PATCH 6/8] MAINT-7067 Issue with UI artifacts showing up in Abuse Report screenshots. --- indra/newview/app_settings/settings.xml | 11 +++++++++++ indra/newview/llfloaterreporter.cpp | 16 +++++++++++++--- indra/newview/llfloaterreporter.h | 2 ++ 3 files changed, 26 insertions(+), 3 deletions(-) diff --git a/indra/newview/app_settings/settings.xml b/indra/newview/app_settings/settings.xml index d016e59142..e60cfad240 100644 --- a/indra/newview/app_settings/settings.xml +++ b/indra/newview/app_settings/settings.xml @@ -14438,6 +14438,17 @@ Change of this parameter will affect the layout of buttons in notification toast Value 75 + AbuseReportScreenshotDelay + + Comment + Time delay before taking screenshot to avoid UI artifacts. + Persist + 1 + Type + F32 + Value + 0.3 + SpeedTest Comment diff --git a/indra/newview/llfloaterreporter.cpp b/indra/newview/llfloaterreporter.cpp index f90e7b42df..08030a66b4 100644 --- a/indra/newview/llfloaterreporter.cpp +++ b/indra/newview/llfloaterreporter.cpp @@ -35,6 +35,7 @@ #include "llassetstorage.h" #include "llavatarnamecache.h" #include "llcachename.h" +#include "llcallbacklist.h" #include "llcheckboxctrl.h" #include "llfontgl.h" #include "llimagebmp.h" @@ -211,7 +212,7 @@ BOOL LLFloaterReporter::postBuild() // grab the user's name std::string reporter = LLSLURL("agent", gAgent.getID(), "inspect").getSLURLString(); getChild("reporter_field")->setValue(reporter); - + // FIRE-15218: Refresh screenshot button getChild("refresh_screenshot")->setCommitCallback(boost::bind(&LLFloaterReporter::onUpdateScreenshot, this)); @@ -849,8 +850,9 @@ void LLFloaterReporter::takeScreenshot(bool use_prev_screenshot) } } -void LLFloaterReporter::onOpen(const LLSD& key) +void LLFloaterReporter::takeNewSnapshot() { + childSetEnabled("send_btn", true); mImageRaw = new LLImageRaw; const S32 IMAGE_WIDTH = 1024; const S32 IMAGE_HEIGHT = 768; @@ -879,10 +881,18 @@ void LLFloaterReporter::onOpen(const LLSD& key) } } } - takeScreenshot(); } + +void LLFloaterReporter::onOpen(const LLSD& key) +{ + childSetEnabled("send_btn", false); + //Time delay to avoid UI artifacts. MAINT-7067 + doAfterInterval(boost::bind(&LLFloaterReporter::takeNewSnapshot,this), gSavedSettings.getF32("AbuseReportScreenshotDelay")); + +} + void LLFloaterReporter::onLoadScreenshotDialog(const LLSD& notification, const LLSD& response) { S32 option = LLNotificationsUtil::getSelectedOption(notification, response); diff --git a/indra/newview/llfloaterreporter.h b/indra/newview/llfloaterreporter.h index d026687bc2..457e816524 100644 --- a/indra/newview/llfloaterreporter.h +++ b/indra/newview/llfloaterreporter.h @@ -107,6 +107,8 @@ public: void onLoadScreenshotDialog(const LLSD& notification, const LLSD& response); + void takeNewSnapshot(); + private: static void show(const LLUUID& object_id, const std::string& avatar_name = LLStringUtil::null, const LLUUID& experience_id = LLUUID::null); From 65aaac2924acd3d81909f847cf5ccd368ef39db2 Mon Sep 17 00:00:00 2001 From: Ansariel Date: Sat, 4 Feb 2017 13:28:02 +0100 Subject: [PATCH 7/8] FIRE-20838: Refreshing the Abuse Report snapshot no longer works --- indra/newview/llfloaterreporter.cpp | 20 +++++++++++++------- indra/newview/llfloaterreporter.h | 5 ++++- 2 files changed, 17 insertions(+), 8 deletions(-) diff --git a/indra/newview/llfloaterreporter.cpp b/indra/newview/llfloaterreporter.cpp index 08030a66b4..1ea072ee58 100644 --- a/indra/newview/llfloaterreporter.cpp +++ b/indra/newview/llfloaterreporter.cpp @@ -850,7 +850,10 @@ void LLFloaterReporter::takeScreenshot(bool use_prev_screenshot) } } -void LLFloaterReporter::takeNewSnapshot() +// Refresh screenshot button +//void LLFloaterReporter::takeNewSnapshot() +void LLFloaterReporter::takeNewSnapshot(bool refresh) +// { childSetEnabled("send_btn", true); mImageRaw = new LLImageRaw; @@ -867,7 +870,10 @@ void LLFloaterReporter::takeNewSnapshot() } setVisible(TRUE); - if(gSavedPerAccountSettings.getBOOL("PreviousScreenshotForReport")) + // Refresh screenshot button + //if(gSavedPerAccountSettings.getBOOL("PreviousScreenshotForReport")) + if(gSavedPerAccountSettings.getBOOL("PreviousScreenshotForReport") && !refresh) + // { std::string screenshot_filename(gDirUtilp->getLindenUserDir() + gDirUtilp->getDirDelimiter() + SCREEN_PREV_FILENAME); mPrevImageRaw = new LLImageRaw; @@ -889,8 +895,10 @@ void LLFloaterReporter::onOpen(const LLSD& key) { childSetEnabled("send_btn", false); //Time delay to avoid UI artifacts. MAINT-7067 - doAfterInterval(boost::bind(&LLFloaterReporter::takeNewSnapshot,this), gSavedSettings.getF32("AbuseReportScreenshotDelay")); - + // Refresh screenshot button + //doAfterInterval(boost::bind(&LLFloaterReporter::takeNewSnapshot,this), gSavedSettings.getF32("AbuseReportScreenshotDelay")); + doAfterInterval(boost::bind(&LLFloaterReporter::takeNewSnapshot,this, false), gSavedSettings.getF32("AbuseReportScreenshotDelay")); + // } void LLFloaterReporter::onLoadScreenshotDialog(const LLSD& notification, const LLSD& response) @@ -968,9 +976,7 @@ void LLFloaterReporter::onClose(bool app_quitting) // FIRE-15368: Don't include floater in screenshot update void LLFloaterReporter::onUpdateScreenshot() { - setVisible(FALSE); - takeScreenshot(); - setVisible(TRUE); + doAfterInterval(boost::bind(&LLFloaterReporter::takeNewSnapshot,this, true), gSavedSettings.getF32("AbuseReportScreenshotDelay")); } // diff --git a/indra/newview/llfloaterreporter.h b/indra/newview/llfloaterreporter.h index 457e816524..bb8d39e30e 100644 --- a/indra/newview/llfloaterreporter.h +++ b/indra/newview/llfloaterreporter.h @@ -107,7 +107,10 @@ public: void onLoadScreenshotDialog(const LLSD& notification, const LLSD& response); - void takeNewSnapshot(); + // Refresh screenshot button + //void takeNewSnapshot(); + void takeNewSnapshot(bool refresh); + // private: static void show(const LLUUID& object_id, const std::string& avatar_name = LLStringUtil::null, const LLUUID& experience_id = LLUUID::null); From 76fe127f76f3cc5e42e3f39b4491716d17cc7bad Mon Sep 17 00:00:00 2001 From: Tonya Souther Date: Sat, 4 Feb 2017 10:25:25 -0600 Subject: [PATCH 8/8] Compile fix for OS X. --- indra/llcommon/llheteromap.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/indra/llcommon/llheteromap.h b/indra/llcommon/llheteromap.h index 9d6f303d08..7e96172333 100644 --- a/indra/llcommon/llheteromap.h +++ b/indra/llcommon/llheteromap.h @@ -77,7 +77,7 @@ private: // not always equal &typeid(A) in some other part. Use special comparator. struct type_info_ptr_comp { - bool operator()(const std::type_info* lhs, const std::type_info* rhs) + bool operator()(const std::type_info* lhs, const std::type_info* rhs) const { return lhs->before(*rhs); }