From c166f3fe157041dd0bba02d793a4923f48c39438 Mon Sep 17 00:00:00 2001 From: Ansariel Date: Thu, 27 Oct 2016 21:25:59 +0200 Subject: [PATCH 1/5] FIRE-20278: Fix crash in LSL preprocessor lazy lists by Sei Lisa --- indra/newview/fslslpreproc.cpp | 11 +++++++---- 1 file changed, 7 insertions(+), 4 deletions(-) diff --git a/indra/newview/fslslpreproc.cpp b/indra/newview/fslslpreproc.cpp index 147f7bc5b4..7ed316b3e0 100644 --- a/indra/newview/fslslpreproc.cpp +++ b/indra/newview/fslslpreproc.cpp @@ -913,16 +913,19 @@ static void subst_lazy_references(std::string& script, std::string retype, std:: static std::string reformat_lazy_lists(std::string script) { script = boost::regex_replace(script, boost::regex(rDOT_MATCHES_NEWLINE - rCMNT_OR_STR "|" + rCMNT_OR_STR + // exclude some keywords as possible identifiers that can + // be followed by an opening square bracket (FIRE-20278) + "|(?:return|do|else)(?![A-Za-z0-9_])" // group 1: identifier - "([a-zA-Z_][a-zA-Z0-9_]*+)" rOPT_SPC + "|([a-zA-Z_][a-zA-Z0-9_]*+)" rOPT_SPC // group 2: expression within brackets "\\[((?:" rCMNT_OR_STR // group 3: recursive bracketed expression "|(\\[(?:" rCMNT_OR_STR "|[^][]|(?3))*+\\])" // recursive bracketed expression (e.g. []!=[]) "|[^][]" // or anything else - ")+?)\\]" rOPT_SPC // non-greedy - "=" rOPT_SPC + ")++)\\]" rOPT_SPC + "=(?!=)" rOPT_SPC // = but not == // group 4: right-hand side expression "((?:" rCMNT_OR_STR // group 5: recursive parenthesized expression From a164bc21cd887d91d02f6984250ca7f775c86ad2 Mon Sep 17 00:00:00 2001 From: Ansariel Date: Fri, 28 Oct 2016 14:21:14 +0200 Subject: [PATCH 2/5] Fix startup crash in LLStatusBar --- indra/newview/llstatusbar.cpp | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/indra/newview/llstatusbar.cpp b/indra/newview/llstatusbar.cpp index 9868606b22..3a79477caa 100644 --- a/indra/newview/llstatusbar.cpp +++ b/indra/newview/llstatusbar.cpp @@ -450,6 +450,11 @@ BOOL LLStatusBar::postBuild() mBalancePanel = getChild("balance_bg"); mTimeMediaPanel = getChild("time_and_media_bg"); + mFilterEdit = getChild("search_menu_edit"); + mSearchPanel = getChild("menu_search_panel"); + mFPSText = getChild("FPSText"); + mVolumeIconsWidth = mBtnVolume->getRect().mRight - mStreamToggle->getRect().mLeft; + initParcelIcons(); mParcelChangedObserver = new LLParcelChangeObserver(this); @@ -479,8 +484,6 @@ BOOL LLStatusBar::postBuild() } // Hook up and init for filtering - mFilterEdit = getChild("search_menu_edit"); - mSearchPanel = getChild("menu_search_panel"); mSearchPanel->setVisible(gSavedSettings.getBOOL("FSMenuSearch")); mFilterEdit->setKeystrokeCallback(boost::bind(&LLStatusBar::onUpdateFilterTerm, this)); mFilterEdit->setCommitCallback(boost::bind(&LLStatusBar::onUpdateFilterTerm, this)); @@ -489,7 +492,6 @@ BOOL LLStatusBar::postBuild() // // FIRE-14482: Show FPS in status bar - mFPSText = getChild("FPSText"); gSavedSettings.getControl("FSStatusBarShowFPS")->getSignal()->connect(boost::bind(&LLStatusBar::onShowFPSChanged, this, _2)); if (!gSavedSettings.getBOOL("FSStatusBarShowFPS")) { @@ -498,7 +500,6 @@ BOOL LLStatusBar::postBuild() // // Option to hide volume controls (sounds, media, stream) in upper right - mVolumeIconsWidth = mBtnVolume->getRect().mRight - mStreamToggle->getRect().mLeft; if (!gSavedSettings.getBOOL("FSEnableVolumeControls")) { updateVolumeControlsVisibility(LLSD(FALSE)); From c8baa6e7d35cecc323afb4b380ace357a1cc8bbf Mon Sep 17 00:00:00 2001 From: Ansariel Date: Fri, 28 Oct 2016 22:24:12 +0200 Subject: [PATCH 3/5] FIRE-20280: Add clothing via double-click allows wearing more than one physics layer --- indra/newview/llinventorybridge.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/indra/newview/llinventorybridge.cpp b/indra/newview/llinventorybridge.cpp index 0b6f4622d8..932dd6e7ce 100644 --- a/indra/newview/llinventorybridge.cpp +++ b/indra/newview/llinventorybridge.cpp @@ -6937,7 +6937,7 @@ void LLWearableBridge::openItem() performAction(getInventoryModel(), // FIRE-17166: Add Clothes on Double Click //get_is_item_worn(mUUID) ? "take_off" : "wear"); - get_is_item_worn(mUUID) ? "take_off" : (mAssetType == LLAssetType::AT_BODYPART || !gSavedSettings.getBOOL("FSDoubleClickAddInventoryClothing") ? "wear" : "wear_add")); + get_is_item_worn(mUUID) ? "take_off" : (mAssetType == LLAssetType::AT_BODYPART || (mAssetType == LLAssetType::AT_CLOTHING && mWearableType == LLWearableType::WT_PHYSICS) || !gSavedSettings.getBOOL("FSDoubleClickAddInventoryClothing") ? "wear" : "wear_add")); // } From 8ab7732ef17e0071a77ba0dbf3ff274d66739105 Mon Sep 17 00:00:00 2001 From: Tonya Souther Date: Sun, 30 Oct 2016 03:51:53 -0500 Subject: [PATCH 4/5] Updating OS X llceflib. --- autobuild.xml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/autobuild.xml b/autobuild.xml index e7f289105e..7d02b6fde8 100755 --- a/autobuild.xml +++ b/autobuild.xml @@ -1693,11 +1693,11 @@ archive hash - 85d8896ca1cec09affc48122aeea22d2 + 0f8170db50edda729816c943487480d2 hash_algorithm md5 url - http://downloads.phoenixviewer.com/llceflib-1.5.3.201606212155-r177-darwin-201606212155-r177.tar.bz2 + http://downloads.phoenixviewer.com/llceflib-1.5.3.201610292046-r200-darwin-201610292046-r200.tar.bz2 name darwin From 27169fa43d0bd9411c74ddc38ed61d88273a61cc Mon Sep 17 00:00:00 2001 From: Tonya Souther Date: Sun, 30 Oct 2016 03:55:40 -0500 Subject: [PATCH 5/5] Updating SLPlugin for llceflib update. --- autobuild.xml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/autobuild.xml b/autobuild.xml index 7d02b6fde8..56586fbecb 100755 --- a/autobuild.xml +++ b/autobuild.xml @@ -27,9 +27,9 @@ archive hash - 47638329878c5f559e78b1b71587716f + 4c3728f376711663c22d32b6d71689df url - http://downloads.phoenixviewer.com/slplugin_x86-4.7.10.50754-darwin-201608180707-r5.tar.bz2 + http://downloads.phoenixviewer.com/slplugin_x86-4.7.10.51243-darwin-201610300350-r5.tar.bz2 name windows