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

Merge branch 'master' into FIRE-35686

master
Angeldark Raymaker 2025-08-23 16:51:35 +01:00
parent dc540f664d 489d1bb044
commit 587897e5be
7 changed files with 144 additions and 136 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
.github/workflows/build_viewer.yml vendored
View File

@ -35,12 +35,9 @@ jobs:
build_matrix:
strategy:
matrix:
os: [macos-15,ubuntu-24.04,windows-2022]
os: [macos-15,ubuntu-22.04,windows-2022]
grid: [sl,os]
variant: [regular, avx]
include:
- os: ubuntu-24.04
container_image: ubuntu:22.04 # only Linux uses a container
runs-on: ${{ matrix.os }}
container: ${{ matrix.container_image }}
outputs:
@ -128,17 +125,16 @@ jobs:
with:
swap-storage: false
- name: Install GCC-14
- name: Install GCC-13
if: runner.os == 'Linux'
run: |
sudo apt-get update
sudo apt-get install -y software-properties-common
sudo add-apt-repository -y ppa:ubuntu-toolchain-r/test
sudo apt-get update
sudo apt-get install -y gcc-14 g++-14
echo "CC=gcc-14" >> $GITHUB_ENV
echo "CXX=g++-14" >> $GITHUB_ENV
sudo apt-get install -y gcc-13 g++-13
sudo update-alternatives --install /usr/bin/gcc gcc /usr/bin/gcc-13 130 \
--slave /usr/bin/g++ g++ /usr/bin/g++-13
echo "CC=gcc-13" >> $GITHUB_ENV
echo "CXX=g++-13" >> $GITHUB_ENV
- name: Setup rclone and download the folder
uses: beqjanus/setup-rclone@main
with:

6
indra/llui/llfloater.cpp
View File

@ -338,8 +338,10 @@ void LLFloater::initFloater(const Params& p)
// Help button: '?'
//SL-14050 Disable all Help question marks
// <FS:Ansariel> Nope!
mButtonsEnabled[BUTTON_HELP] = !mHelpTopic.empty();// false;
// <FS:TJ> Disable the help button only if the debug setting is on
static LLUICachedControl<bool> hide_help_buttons ("FSHideHelpButtons", false);
mButtonsEnabled[BUTTON_HELP] = !mHelpTopic.empty() && !hide_help_buttons;// false;
// </FS:TJ>
// Minimize button only for top draggers
if ( !mDragOnLeft && mCanMinimize )

11
indra/newview/app_settings/settings.xml
View File

@ -26762,5 +26762,16 @@ Change of this parameter will affect the layout of buttons in notification toast
<integer>0</integer>
</map>
<!-- </FS:Zi> Area Search Defaults -->
<key>FSHideHelpButtons</key>
<map>
<key>Comment</key>
<string>When enabled, hides the help button from floaters (requires restart)</string>
<key>Persist</key>
<integer>1</integer>
<key>Type</key>
<string>Boolean</string>
<key>Value</key>
<integer>0</integer>
</map>
</map>
</llsd>

19
indra/newview/llfilepicker.cpp
View File

@ -1455,6 +1455,20 @@ static std::string add_collada_filter_to_gtkchooser(GtkWindow *picker)
LLTrans::getString("collada_files") + " (*.dae)");
}
// <FS:Beq> migrate to GLTF support
static std::string add_model_filter_to_gtkchooser(GtkWindow *picker)
{
// "Model files (*.dae, *.gltf, *.glb)"
GtkFileFilter *gfilter = gtk_file_filter_new();
gtk_file_filter_add_pattern(gfilter, "*.dae");
gtk_file_filter_add_pattern(gfilter, "*.gltf");
gtk_file_filter_add_pattern(gfilter, "*.glb");
std::string filtername = LLTrans::getString("model_files") + " (*.dae; *.gltf; *.glb)";
add_common_filters_to_gtkchooser(gfilter, picker, filtername);
return filtername;
}
// </FS:Beq>
static std::string add_imageload_filter_to_gtkchooser(GtkWindow *picker)
{
GtkFileFilter *gfilter = gtk_file_filter_new();
@ -1676,7 +1690,7 @@ bool LLFilePicker::getOpenFile( ELoadFilter filter, bool blocking )
filtername = dead_code_should_blow_up_here(picker);
break;
case FFLOAD_COLLADA:
filtername = add_collada_filter_to_gtkchooser(picker);
filtername = add_model_filter_to_gtkchooser(picker);
break;
case FFLOAD_IMAGE:
filtername = add_imageload_filter_to_gtkchooser(picker);
@ -1936,6 +1950,9 @@ bool LLFilePicker::openFileDialog( int32_t filter, bool blocking, EType aType )
file_dialog_filter = "*.raw";
break;
case FFLOAD_MODEL:
file_type = "model_files";
file_dialog_filter = "*.{dae,gltf,glb}";
break;
case FFLOAD_COLLADA:
file_type = "collada_files";
file_dialog_filter = "*.dae";

61
indra/newview/particleeditor.cpp
View File

@ -22,8 +22,6 @@
#include "llviewerprecompiledheaders.h"
#include "particleeditor.h"
#include <fstream>
#include "llagent.h"
#include "llappviewer.h"
#include "llcheckboxctrl.h"
@ -47,10 +45,7 @@
#include "llwindow.h"
#include "llviewerassetupload.h"
ParticleEditor::ParticleEditor(const LLSD& key)
: LLFloater(key),
mObject(0),
mParticleScriptInventoryItem(0)
ParticleEditor::ParticleEditor(const LLSD& key) : LLFloater(key)
{
mPatternMap["drop"] = LLPartSysData::LL_PART_SRC_PATTERN_DROP;
mPatternMap["explode"] = LLPartSysData::LL_PART_SRC_PATTERN_EXPLODE;
@ -325,11 +320,11 @@ void ParticleEditor::updateUI()
bool targetLinear = mTargetLinearCheckBox->getValue();
bool interpolateColor = mInterpolateColorCheckBox->getValue();
bool interpolateScale = mInterpolateScaleCheckBox->getValue();
bool targetEnabled = targetLinear | (mTargetPositionCheckBox->getValue().asBoolean() ? true : false);
bool targetEnabled = targetLinear || (mTargetPositionCheckBox->getValue().asBoolean() ? true : false);
mBurstRadiusSpinner->setEnabled(!(targetLinear | (mFollowSourceCheckBox->getValue().asBoolean() ? true : false) | dropPattern));
mBurstSpeedMinSpinner->setEnabled(!(targetLinear | dropPattern));
mBurstSpeedMaxSpinner->setEnabled(!(targetLinear | dropPattern));
mBurstRadiusSpinner->setEnabled(!targetLinear && !(mFollowSourceCheckBox->getValue().asBoolean() ? true : false) && !dropPattern);
mBurstSpeedMinSpinner->setEnabled(!targetLinear && !dropPattern);
mBurstSpeedMaxSpinner->setEnabled(!targetLinear && !dropPattern);
// disabling a color swatch does nothing visually, so we also set alpha
LLColor4 endColor = mEndColorSelector->get();
@ -355,8 +350,8 @@ void ParticleEditor::updateUI()
mOmegaYSpinner->setEnabled(!targetLinear);
mOmegaZSpinner->setEnabled(!targetLinear);
mAngleBeginSpinner->setEnabled(!(explodePattern | dropPattern));
mAngleEndSpinner->setEnabled(!(explodePattern | dropPattern));
mAngleBeginSpinner->setEnabled(!explodePattern && !dropPattern);
mAngleEndSpinner->setEnabled(!explodePattern && !dropPattern);
}
void ParticleEditor::onClearTargetButtonClicked()
@ -369,15 +364,13 @@ void ParticleEditor::onTargetPickerButtonClicked()
{
mPickTargetButton->setToggleState(true);
mPickTargetButton->setEnabled(false);
startPicking(this);
startPicking();
}
// inspired by the LLFloaterReporter object picker
// static
void ParticleEditor::startPicking(void* userdata)
void ParticleEditor::startPicking()
{
ParticleEditor* self = (ParticleEditor*) userdata;
LLToolObjPicker::getInstance()->setExitCallback(ParticleEditor::onTargetPicked, self);
LLToolObjPicker::getInstance()->setExitCallback(ParticleEditor::onTargetPicked, this);
LLToolMgr::getInstance()->setTransientTool(LLToolObjPicker::getInstance());
}
@ -386,14 +379,12 @@ void ParticleEditor::onTargetPicked(void* userdata)
{
ParticleEditor* self = (ParticleEditor*)userdata;
LLUUID picked = LLToolObjPicker::getInstance()->getObjectID();
LLToolMgr::getInstance()->clearTransientTool();
self->mPickTargetButton->setEnabled(true);
self->mPickTargetButton->setToggleState(false);
if (picked.notNull())
if (LLUUID picked = LLToolObjPicker::getInstance()->getObjectID(); picked.notNull())
{
self->mTargetKeyInput->setValue(picked.asString());
self->onParameterChange();
@ -522,8 +513,7 @@ default\n\
void ParticleEditor::onCopyButtonClicked()
{
std::string script = createScript();
if (!script.empty())
if (std::string script = createScript(); !script.empty())
{
getWindow()->copyTextToClipboard(utf8str_to_wstring(script));
LLNotificationsUtil::add("ParticleScriptCopiedToClipboard");
@ -608,9 +598,7 @@ void ParticleEditor::callbackReturned(const LLUUID& inventoryItemID)
gInventory.notifyObservers();
//caps import
std::string url = gAgent.getRegionCapability("UpdateScriptAgent");
if (!url.empty())
if (std::string url = gAgent.getRegionCapability("UpdateScriptAgent"); !url.empty())
{
std::string script = createScript();
@ -633,30 +621,23 @@ void ParticleEditor::callbackReturned(const LLUUID& inventoryItemID)
void ParticleEditor::scriptInjectReturned()
{
setCanClose(true);
mMainPanel->setEnabled(true);
// play it safe, because some time may have passed
LLViewerObject* object = gObjectList.findObject(mObject->getID());
if (!object || mObject->isDead())
if (LLViewerObject* object = gObjectList.findObject(mObject->getID()); object && mObject&& !mObject->isDead())
{
mObject->saveScript(mParticleScriptInventoryItem, true, false);
LLNotificationsUtil::add("ParticleScriptInjected");
}
else
{
LL_WARNS() << "Can't inject script - object is dead or went away!" << LL_ENDL;
mMainPanel->setEnabled(true);
return;
}
mObject->saveScript(mParticleScriptInventoryItem, true, false);
LLNotificationsUtil::add("ParticleScriptInjected");
delete this;
}
// ---------------------------------- Callbacks ----------------------------------
ParticleScriptCreationCallback::ParticleScriptCreationCallback(ParticleEditor* editor)
{
mEditor = editor;
}
ParticleScriptCreationCallback::~ParticleScriptCreationCallback()
ParticleScriptCreationCallback::ParticleScriptCreationCallback(ParticleEditor* editor) : mEditor(editor)
{
}

164
indra/newview/particleeditor.h
View File

@ -43,117 +43,117 @@ class ParticleEditor : public LLFloater
friend class ParticleScriptCreationCallback;
friend class ParticleScriptUploadResponder;
public:
ParticleEditor(const LLSD& key);
~ParticleEditor();
public:
ParticleEditor(const LLSD& key);
~ParticleEditor();
bool postBuild() override;
bool postBuild() override;
void setObject(LLViewerObject* objectp);
void scriptInjectReturned( );
void setObject(LLViewerObject* objectp);
void scriptInjectReturned();
protected:
void clearParticles();
void updateParticles();
void updateUI();
protected:
void clearParticles();
void updateParticles();
void updateUI();
std::string createScript();
void createScriptInventoryItem(LLUUID categoryID);
std::string createScript();
void createScriptInventoryItem(LLUUID categoryID);
void onParameterChange();
void onCopyButtonClicked();
void onInjectButtonClicked();
void onParameterChange();
void onCopyButtonClicked();
void onInjectButtonClicked();
void onClearTargetButtonClicked();
void onTargetPickerButtonClicked();
static void startPicking(void* userdata);
static void onTargetPicked(void* userdata);
void onClearTargetButtonClicked();
void onTargetPickerButtonClicked();
void startPicking();
static void onTargetPicked(void* userdata);
void callbackReturned(const LLUUID& inv_item);
void callbackReturned(const LLUUID& inv_item);
std::string lslVector(F32 x, F32 y, F32 z);
std::string lslColor(const LLColor4& color);
std::string lslVector(F32 x, F32 y, F32 z);
std::string lslColor(const LLColor4& color);
LLViewerObject* mObject;
LLViewerTexture* mTexture;
LLViewerInventoryItem* mParticleScriptInventoryItem;
LLViewerObject* mObject{ nullptr };
LLViewerTexture* mTexture{ nullptr };
LLViewerInventoryItem* mParticleScriptInventoryItem{ nullptr };
LLViewerTexture* mDefaultParticleTexture;
LLViewerTexture* mDefaultParticleTexture{ nullptr };
LLPartSysData mParticles;
LLPartSysData mParticles;
std::map<std::string, U8> mPatternMap;
std::map<std::string, std::string> mScriptPatternMap;
std::map<std::string, U8> mPatternMap;
std::map<std::string, std::string> mScriptPatternMap;
std::map<std::string, U8> mBlendMap;
std::map<std::string, std::string> mScriptBlendMap;
std::map<std::string, U8> mBlendMap;
std::map<std::string, std::string> mScriptBlendMap;
LLPanel* mMainPanel;
LLPanel* mMainPanel{ nullptr };
LLComboBox* mPatternTypeCombo;
LLTextureCtrl* mTexturePicker;
LLComboBox* mPatternTypeCombo{ nullptr };
LLTextureCtrl* mTexturePicker{ nullptr };
LLSpinCtrl* mBurstRateSpinner;
LLSpinCtrl* mBurstCountSpinner;
LLSpinCtrl* mBurstRadiusSpinner;
LLSpinCtrl* mAngleBeginSpinner;
LLSpinCtrl* mAngleEndSpinner;
LLSpinCtrl* mBurstSpeedMinSpinner;
LLSpinCtrl* mBurstSpeedMaxSpinner;
LLSpinCtrl* mStartAlphaSpinner;
LLSpinCtrl* mEndAlphaSpinner;
LLSpinCtrl* mScaleStartXSpinner;
LLSpinCtrl* mScaleStartYSpinner;
LLSpinCtrl* mScaleEndXSpinner;
LLSpinCtrl* mScaleEndYSpinner;
LLSpinCtrl* mSourceMaxAgeSpinner;
LLSpinCtrl* mParticlesMaxAgeSpinner;
LLSpinCtrl* mStartGlowSpinner;
LLSpinCtrl* mEndGlowSpinner;
LLSpinCtrl* mBurstRateSpinner{ nullptr };
LLSpinCtrl* mBurstCountSpinner{ nullptr };
LLSpinCtrl* mBurstRadiusSpinner{ nullptr };
LLSpinCtrl* mAngleBeginSpinner{ nullptr };
LLSpinCtrl* mAngleEndSpinner{ nullptr };
LLSpinCtrl* mBurstSpeedMinSpinner{ nullptr };
LLSpinCtrl* mBurstSpeedMaxSpinner{ nullptr };
LLSpinCtrl* mStartAlphaSpinner{ nullptr };
LLSpinCtrl* mEndAlphaSpinner{ nullptr };
LLSpinCtrl* mScaleStartXSpinner{ nullptr };
LLSpinCtrl* mScaleStartYSpinner{ nullptr };
LLSpinCtrl* mScaleEndXSpinner{ nullptr };
LLSpinCtrl* mScaleEndYSpinner{ nullptr };
LLSpinCtrl* mSourceMaxAgeSpinner{ nullptr };
LLSpinCtrl* mParticlesMaxAgeSpinner{ nullptr };
LLSpinCtrl* mStartGlowSpinner{ nullptr };
LLSpinCtrl* mEndGlowSpinner{ nullptr };
LLComboBox* mBlendFuncSrcCombo;
LLComboBox* mBlendFuncDestCombo;
LLComboBox* mBlendFuncSrcCombo{ nullptr };
LLComboBox* mBlendFuncDestCombo{ nullptr };
LLCheckBoxCtrl* mBounceCheckBox;
LLCheckBoxCtrl* mEmissiveCheckBox;
LLCheckBoxCtrl* mFollowSourceCheckBox;
LLCheckBoxCtrl* mFollowVelocityCheckBox;
LLCheckBoxCtrl* mInterpolateColorCheckBox;
LLCheckBoxCtrl* mInterpolateScaleCheckBox;
LLCheckBoxCtrl* mTargetPositionCheckBox;
LLCheckBoxCtrl* mTargetLinearCheckBox;
LLCheckBoxCtrl* mWindCheckBox;
LLCheckBoxCtrl* mRibbonCheckBox;
LLCheckBoxCtrl* mBounceCheckBox{ nullptr };
LLCheckBoxCtrl* mEmissiveCheckBox{ nullptr };
LLCheckBoxCtrl* mFollowSourceCheckBox{ nullptr };
LLCheckBoxCtrl* mFollowVelocityCheckBox{ nullptr };
LLCheckBoxCtrl* mInterpolateColorCheckBox{ nullptr };
LLCheckBoxCtrl* mInterpolateScaleCheckBox{ nullptr };
LLCheckBoxCtrl* mTargetPositionCheckBox{ nullptr };
LLCheckBoxCtrl* mTargetLinearCheckBox{ nullptr };
LLCheckBoxCtrl* mWindCheckBox{ nullptr };
LLCheckBoxCtrl* mRibbonCheckBox{ nullptr };
LLLineEditor* mTargetKeyInput;
LLButton* mClearTargetButton;
LLButton* mPickTargetButton;
LLLineEditor* mTargetKeyInput{ nullptr };
LLButton* mClearTargetButton{ nullptr };
LLButton* mPickTargetButton{ nullptr };
LLSpinCtrl* mAcellerationXSpinner;
LLSpinCtrl* mAcellerationYSpinner;
LLSpinCtrl* mAcellerationZSpinner;
LLSpinCtrl* mAcellerationXSpinner{ nullptr };
LLSpinCtrl* mAcellerationYSpinner{ nullptr };
LLSpinCtrl* mAcellerationZSpinner{ nullptr };
LLSpinCtrl* mOmegaXSpinner;
LLSpinCtrl* mOmegaYSpinner;
LLSpinCtrl* mOmegaZSpinner;
LLSpinCtrl* mOmegaXSpinner{ nullptr };
LLSpinCtrl* mOmegaYSpinner{ nullptr };
LLSpinCtrl* mOmegaZSpinner{ nullptr };
LLColorSwatchCtrl* mStartColorSelector;
LLColorSwatchCtrl* mEndColorSelector;
LLColorSwatchCtrl* mStartColorSelector{ nullptr };
LLColorSwatchCtrl* mEndColorSelector{ nullptr };
LLButton* mCopyToLSLButton;
LLButton* mInjectScriptButton;
LLButton* mCopyToLSLButton{ nullptr };
LLButton* mInjectScriptButton{ nullptr };
};
class ParticleScriptCreationCallback : public LLInventoryCallback
{
public:
ParticleScriptCreationCallback(ParticleEditor* editor);
void fire(const LLUUID& inventoryItem);
public:
ParticleScriptCreationCallback(ParticleEditor* editor);
void fire(const LLUUID& inventoryItem);
protected:
~ParticleScriptCreationCallback();
protected:
~ParticleScriptCreationCallback() = default;
ParticleEditor* mEditor;
ParticleEditor* mEditor;
};
#endif // PARTICLEEDITOR_H

1
indra/newview/skins/default/xui/en/strings.xml
View File

@ -663,6 +663,7 @@ https://www.firestormviewer.org/support for help fixing this problem.
<string name="dictionary_files">Dictionaries</string>
<string name="backup_files">Object Backups</string>
<string name="collada_files">COLLADA Models</string>
<string name="model_files">Mesh Models</string>
<string name="csv_files">Comma separated values</string>
<string name="recompile_script_verb">Recompile</string>