From 92bf4bbcfedfc4c66ab4a340be10de060a53216d Mon Sep 17 00:00:00 2001 From: Beq Date: Fri, 4 Oct 2024 13:20:52 +0100 Subject: [PATCH 1/4] Ensure single binary is submitted for signing. --- .github/workflows/sign.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/sign.yml b/.github/workflows/sign.yml index 9d300f8c13..eab0e71f17 100644 --- a/.github/workflows/sign.yml +++ b/.github/workflows/sign.yml @@ -98,7 +98,7 @@ jobs: uses: actions/upload-artifact@v4 with: name: unsigned-artifact-${{ matrix.file }} - path: to_sign/ + path: to_sign/${{ matrix.file }} - name: sign the file uses: signpath/github-action-submit-signing-request@v1 From 205e259d4231dbf8e98be82a0ae2cfe24ae27680 Mon Sep 17 00:00:00 2001 From: Brad Linden <46733234+brad-linden@users.noreply.github.com> Date: Wed, 28 Aug 2024 16:20:25 -0700 Subject: [PATCH 2/4] Attempt to get better file/line info for LL_ERRS crahses in bugsplat. (#2447) secondlife/viewer#2445 --- indra/llcommon/llerror.cpp | 16 ---------------- indra/llcommon/llerror.h | 11 +++++------ 2 files changed, 5 insertions(+), 22 deletions(-) diff --git a/indra/llcommon/llerror.cpp b/indra/llcommon/llerror.cpp index e04f7e53a9..f4bd6cc293 100644 --- a/indra/llcommon/llerror.cpp +++ b/indra/llcommon/llerror.cpp @@ -1659,19 +1659,3 @@ namespace LLError sLocalizedOutOfMemoryWarning = message; } } - -void crashdriver(void (*callback)(int*)) -{ - // The LLERROR_CRASH macro used to have inline code of the form: - //int* make_me_crash = NULL; - //*make_me_crash = 0; - - // But compilers are getting smart enough to recognize that, so we must - // assign to an address supplied by a separate source file. We could do - // the assignment here in crashdriver() -- but then BugSplat would group - // all LL_ERRS() crashes as the fault of this one function, instead of - // identifying the specific LL_ERRS() source line. So instead, do the - // assignment in a lambda in the caller's source. We just provide the - // nullptr target. - callback(nullptr); -} diff --git a/indra/llcommon/llerror.h b/indra/llcommon/llerror.h index e92a607076..db0d0f2f4c 100644 --- a/indra/llcommon/llerror.h +++ b/indra/llcommon/llerror.h @@ -420,9 +420,11 @@ typedef LLError::NoClassInfo _LL_CLASS_TO_LOG; #define LL_NEWLINE '\n' // Use this only in LL_ERRS or in a place that LL_ERRS may not be used -#define LLERROR_CRASH \ -{ \ - crashdriver([](int* ptr){ *ptr = 0; exit(*ptr); }); \ +#define LLERROR_CRASH \ +{ \ + int* make_me_crash = (int*)0xDEADBEEFDEADBEEFUL; \ + *make_me_crash = 0; \ + exit(*make_me_crash); \ } #define LL_ENDL \ @@ -524,7 +526,4 @@ LL_DEBUGS("SomeTag") performs the locking and map-searching ONCE, then caches the result in a static variable. */ -// used by LLERROR_CRASH -void crashdriver(void (*)(int*)); - #endif // LL_LLERROR_H From 883714b83d1e9592d0b3f06b16d7b40362beadf2 Mon Sep 17 00:00:00 2001 From: Ansariel Date: Sat, 5 Oct 2024 16:27:48 +0200 Subject: [PATCH 3/4] FIRE-34618: Remove hardcoded classified fee for OpenSim --- indra/newview/llpanelprofileclassifieds.cpp | 12 +++++++++--- 1 file changed, 9 insertions(+), 3 deletions(-) diff --git a/indra/newview/llpanelprofileclassifieds.cpp b/indra/newview/llpanelprofileclassifieds.cpp index 6f78ea6753..7dbd032f28 100644 --- a/indra/newview/llpanelprofileclassifieds.cpp +++ b/indra/newview/llpanelprofileclassifieds.cpp @@ -1015,7 +1015,9 @@ void LLPanelProfileClassified::onSaveClick() } if(isNew() || isNewWithErrors()) { - if(gStatusBar->getBalance() < MINIMUM_PRICE_FOR_LISTING) + // OpenSim compatibility + //if(gStatusBar->getBalance() < MINIMUM_PRICE_FOR_LISTING) + if(gStatusBar->getBalance() < getClassifiedFee()) { LLNotificationsUtil::add("ClassifiedInsufficientFunds"); return; @@ -1497,10 +1499,14 @@ void LLPanelProfileClassified::doSave() void LLPanelProfileClassified::onPublishFloaterPublishClicked() { - if (mPublishFloater->getPrice() < MINIMUM_PRICE_FOR_LISTING) + // OpenSim compatibility + //if (mPublishFloater->getPrice() < MINIMUM_PRICE_FOR_LISTING) + if (mPublishFloater->getPrice() < getClassifiedFee()) { LLSD args; - args["MIN_PRICE"] = MINIMUM_PRICE_FOR_LISTING; + // OpenSim compatibility + //args["MIN_PRICE"] = MINIMUM_PRICE_FOR_LISTING; + args["MIN_PRICE"] = getClassifiedFee(); LLNotificationsUtil::add("MinClassifiedPrice", args); return; } From 3432012aefb4b33051991e6623b09e95d624b8da Mon Sep 17 00:00:00 2001 From: Beq Date: Sat, 5 Oct 2024 18:32:06 +0100 Subject: [PATCH 4/4] Revert "Attempt to get better file/line info for LL_ERRS..." needs new tpv_havok This reverts commit 205e259d4231dbf8e98be82a0ae2cfe24ae27680. --- indra/llcommon/llerror.cpp | 16 ++++++++++++++++ indra/llcommon/llerror.h | 11 ++++++----- 2 files changed, 22 insertions(+), 5 deletions(-) diff --git a/indra/llcommon/llerror.cpp b/indra/llcommon/llerror.cpp index f4bd6cc293..e04f7e53a9 100644 --- a/indra/llcommon/llerror.cpp +++ b/indra/llcommon/llerror.cpp @@ -1659,3 +1659,19 @@ namespace LLError sLocalizedOutOfMemoryWarning = message; } } + +void crashdriver(void (*callback)(int*)) +{ + // The LLERROR_CRASH macro used to have inline code of the form: + //int* make_me_crash = NULL; + //*make_me_crash = 0; + + // But compilers are getting smart enough to recognize that, so we must + // assign to an address supplied by a separate source file. We could do + // the assignment here in crashdriver() -- but then BugSplat would group + // all LL_ERRS() crashes as the fault of this one function, instead of + // identifying the specific LL_ERRS() source line. So instead, do the + // assignment in a lambda in the caller's source. We just provide the + // nullptr target. + callback(nullptr); +} diff --git a/indra/llcommon/llerror.h b/indra/llcommon/llerror.h index db0d0f2f4c..e92a607076 100644 --- a/indra/llcommon/llerror.h +++ b/indra/llcommon/llerror.h @@ -420,11 +420,9 @@ typedef LLError::NoClassInfo _LL_CLASS_TO_LOG; #define LL_NEWLINE '\n' // Use this only in LL_ERRS or in a place that LL_ERRS may not be used -#define LLERROR_CRASH \ -{ \ - int* make_me_crash = (int*)0xDEADBEEFDEADBEEFUL; \ - *make_me_crash = 0; \ - exit(*make_me_crash); \ +#define LLERROR_CRASH \ +{ \ + crashdriver([](int* ptr){ *ptr = 0; exit(*ptr); }); \ } #define LL_ENDL \ @@ -526,4 +524,7 @@ LL_DEBUGS("SomeTag") performs the locking and map-searching ONCE, then caches the result in a static variable. */ +// used by LLERROR_CRASH +void crashdriver(void (*)(int*)); + #endif // LL_LLERROR_H