livie
/
phoenix-firestorm
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge branch 'FirestormViewer:master' into Fire-30873-NewPoser

meow-7.2.2
Angeldark Raymaker 2024-10-05 22:23:03 +01:00 committed by GitHub
parent 418c4fa9db 3432012aef
commit ea3388cbfe
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
2 changed files with 10 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
.github/workflows/sign.yml vendored
View File

@ -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

12
indra/newview/llpanelprofileclassifieds.cpp
View File

@ -1015,7 +1015,9 @@ void LLPanelProfileClassified::onSaveClick()
}
if(isNew() || isNewWithErrors())
{
if(gStatusBar->getBalance() < MINIMUM_PRICE_FOR_LISTING)
// <FS:Ansariel> 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)
// <FS:Ansariel> OpenSim compatibility
//if (mPublishFloater->getPrice() < MINIMUM_PRICE_FOR_LISTING)
if (mPublishFloater->getPrice() < getClassifiedFee())
{
LLSD args;
args["MIN_PRICE"] = MINIMUM_PRICE_FOR_LISTING;
// <FS:Ansariel> OpenSim compatibility
//args["MIN_PRICE"] = MINIMUM_PRICE_FOR_LISTING;
args["MIN_PRICE"] = getClassifiedFee();
LLNotificationsUtil::add("MinClassifiedPrice", args);
return;
}