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

Merge branch 'master' of https://vcs.firestormviewer.org/phoenix-firestorm

master
Ansariel 2023-05-31 11:39:04 +02:00
parent 3c6c1e11e5 692a86e7cf
commit fe1f7c225d
14 changed files with 102 additions and 26 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -167,7 +167,7 @@ jobs:
path_sep="\\"
fi
function find_most_recent_bundle() {
local pattern="$1.*$2.*"
local pattern="$1-.*$2-.*"
local most_recent_file=$(ls -t "${{ github.workspace }}" | grep "$pattern" | head -1)
if [ -z "$most_recent_file" ]; then
echo ""

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

@ -7741,7 +7741,7 @@
<key>Type</key>
<string>String</string>
<key>Value</key>
<string>https://status.secondlifegrid.net/history.atom</string>
<string>https://status.secondlifegrid.net/history.rss</string>
</map>
<key>GridStatusUpdateDelay</key>
<map>

40
indra/newview/llfilepicker.cpp
View File

@ -876,25 +876,25 @@ void set_nav_save_data(LLFilePicker::ESaveFilter filter, std::string &extension,
break;
// <FS:CR> Export filter
case FFSAVE_EXPORT:
case LLFilePicker::FFSAVE_EXPORT:
type = "OXP ";
creator = "\?\?\?\?";
extension = "oxp";
break;
case FFSAVE_COLLADA:
case LLFilePicker::FFSAVE_COLLADA:
type = "DAE ";
creator = "\?\?\?\?";
extension = "dae";
break;
// <FS:CR> CSV Filter
case FFSAVE_CSV:
case LLFilePicker::FFSAVE_CSV:
type = "CSV ";
creator = "\?\?\?\?";
extension = "csv";
break;
// </FS:CR>
case FFSAVE_BEAM:
case FFSAVE_XML:
case LLFilePicker::FFSAVE_BEAM:
case LLFilePicker::FFSAVE_XML:
type = "XML ";
creator = "\?\?\?\?";
extension = "xml";
@ -1724,6 +1724,36 @@ BOOL LLFilePicker::getMultipleOpenFiles( ELoadFilter filter, bool blocking)
}
#elif LL_FLTK
BOOL LLFilePicker::getOpenFileModeless(ELoadFilter filter,
void (*callback)(bool, std::vector<std::string> &, void*),
void *userdata)
{
// not supposed to be used yet, use LLFilePickerThread
LL_ERRS() << "NOT IMPLEMENTED" << LL_ENDL;
return FALSE;
}
BOOL LLFilePicker::getMultipleOpenFilesModeless(ELoadFilter filter,
void (*callback)(bool, std::vector<std::string> &, void*),
void *userdata )
{
// not supposed to be used yet, use LLFilePickerThread
LL_ERRS() << "NOT IMPLEMENTED" << LL_ENDL;
return FALSE;
}
BOOL LLFilePicker::getSaveFileModeless(ESaveFilter filter,
const std::string& filename,
void (*callback)(bool, std::string&, void*),
void *userdata)
{
// not supposed to be used yet, use LLFilePickerThread
LL_ERRS() << "NOT IMPLEMENTED" << LL_ENDL;
return FALSE;
}
BOOL LLFilePicker::getSaveFile( ESaveFilter filter, const std::string& filename, bool blocking )
{
return openFileDialog( filter, blocking, eSaveFile );

35
indra/newview/llfloaterimagepreview.cpp
View File

@ -123,6 +123,12 @@ BOOL LLFloaterImagePreview::postBuild()
getChildView("bad_image_text")->setVisible(FALSE);
// <FS:PP> FIRE-32944 - Hide some items if texture is invalid
LLCheckBoxCtrl* temp_check = getChild<LLCheckBoxCtrl>("temp_check");
LLCheckBoxCtrl* lossless_check = getChild<LLCheckBoxCtrl>("lossless_check");
LLUICtrl* uploaded_size_text = getChild<LLUICtrl>("uploaded_size_text");
// </FS:PP>
if (mRawImagep.notNull() && gAgent.getRegion() != NULL)
{
mAvatarPreview = new LLImagePreviewAvatar(256, 256);
@ -142,16 +148,14 @@ BOOL LLFloaterImagePreview::postBuild()
//}
if (mRawImagep->getWidth() * mRawImagep->getHeight () <= LL_IMAGE_REZ_LOSSLESS_CUTOFF * LL_IMAGE_REZ_LOSSLESS_CUTOFF)
{
LLCheckBoxCtrl* check_box = getChild<LLCheckBoxCtrl>("lossless_check");
check_box->setEnabled(TRUE);
check_box->setVisible(TRUE);
check_box->setControlVariable(gSavedSettings.getControl("LosslessJ2CUpload"));
lossless_check->setEnabled(TRUE);
lossless_check->setVisible(TRUE);
lossless_check->setControlVariable(gSavedSettings.getControl("LosslessJ2CUpload"));
}
else
{
LLCheckBoxCtrl* check_box = getChild<LLCheckBoxCtrl>("lossless_check");
check_box->setEnabled(FALSE);
check_box->setVisible(FALSE);
lossless_check->setEnabled(FALSE);
lossless_check->setVisible(FALSE);
}
//</FS:Beq>
@ -162,21 +166,22 @@ BOOL LLFloaterImagePreview::postBuild()
{
gSavedSettings.setBOOL("TemporaryUpload", FALSE);
}
getChild<LLCheckBoxCtrl>("temp_check")->setVisible(enable_temp_uploads);
temp_check->setVisible(enable_temp_uploads);
// </FS:CR>
// <FS:Zi> detect and strip empty alpha layers from images on upload
getChild<LLUICtrl>("ok_btn")->setCommitCallback(boost::bind(&LLFloaterImagePreview::onBtnUpload, this));
getChild<LLUICtrl>("uploaded_size_text")->setTextArg("[X_RES]", llformat("%d", mRawImagep->getWidth()));
getChild<LLUICtrl>("uploaded_size_text")->setTextArg("[Y_RES]", llformat("%d", mRawImagep->getHeight()));
uploaded_size_text->setTextArg("[X_RES]", llformat("%d", mRawImagep->getWidth()));
uploaded_size_text->setTextArg("[Y_RES]", llformat("%d", mRawImagep->getHeight()));
uploaded_size_text->setVisible(TRUE);
mEmptyAlphaCheck = getChild<LLCheckBoxCtrl>("strip_alpha_check");
if (mRawImagep->getComponents() != 4)
{
getChild<LLUICtrl>("image_alpha_warning")->setVisible(false);
getChild<LLUICtrl>("uploaded_size_text")->setTextArg("[ALPHA]", getString("no_alpha"));
uploaded_size_text->setTextArg("[ALPHA]", getString("no_alpha"));
return true;
}
@ -205,7 +210,7 @@ BOOL LLFloaterImagePreview::postBuild()
mEmptyAlphaCheck->setValue(false);
}
getChild<LLUICtrl>("uploaded_size_text")->setTextArg("[ALPHA]", getString(mEmptyAlphaCheck->getValue() ? "no_alpha" : "with_alpha"));
uploaded_size_text->setTextArg("[ALPHA]", getString(mEmptyAlphaCheck->getValue() ? "no_alpha" : "with_alpha"));
// </FS:Zi>
}
else
@ -216,6 +221,12 @@ BOOL LLFloaterImagePreview::postBuild()
getChildView("clothing_type_combo")->setEnabled(FALSE);
getChildView("ok_btn")->setEnabled(FALSE);
// <FS:PP> FIRE-32944 - Hide some items if texture is invalid
uploaded_size_text->setVisible(FALSE);
lossless_check->setVisible(FALSE);
temp_check->setVisible(FALSE);
// </FS:PP>
if(!mImageLoadError.empty())
{
getChild<LLUICtrl>("bad_image_text")->setValue(mImageLoadError.c_str());

3
indra/newview/llimview.cpp
View File

@ -4476,6 +4476,7 @@ void typingNameCallback(const LLUUID& av_id, const LLAvatarName& av_name, const
LLUUID::null,
LLVector3::zero,
false,
0,
true
);
}
@ -4548,6 +4549,7 @@ void typingNameCallback(const LLUUID& av_id, const LLAvatarName& av_name, const
LLUUID::null,
LLVector3::zero,
false,
0,
true
);
@ -4570,6 +4572,7 @@ void typingNameCallback(const LLUUID& av_id, const LLAvatarName& av_name, const
LLUUID::null,
LLVector3::zero,
false,
0,
true);
LLGiveInventory::doGiveInventoryItem(av_id, item, session_id);
}

6
indra/newview/skins/default/xui/en/panel_presets_camera_pulldown.xml
View File

@ -8,7 +8,7 @@
border="false"
chrome="true"
follows="bottom"
height="157"
height="257"
layout="topleft"
name="presets_camera_pulldown"
width="225">
@ -29,7 +29,7 @@
follows="left|top"
layout="topleft"
column_padding="0"
height="100"
height="200"
width="215"
draw_heading="false"
draw_stripes="false"
@ -53,7 +53,7 @@
layout="topleft"
left="5"
name="horiz_separator"
top_delta="105"
top_delta="205"
width="215" />
<button
name="open_prefs_btn"

6
indra/newview/skins/default/xui/en/panel_presets_pulldown.xml
View File

@ -8,7 +8,7 @@
border="false"
chrome="true"
follows="bottom"
height="157"
height="257"
layout="topleft"
name="presets_pulldown"
width="225">
@ -29,7 +29,7 @@
follows="left|top"
layout="topleft"
column_padding="0"
height="100"
height="200"
width="215"
draw_heading="false"
draw_stripes="false"
@ -53,7 +53,7 @@
layout="topleft"
left="5"
name="horiz_separator"
top_delta="105"
top_delta="205"
width="215" />
<button
name="open_prefs_btn"

7
indra/newview/skins/default/xui/fr/mime_types.xml
View File

@ -127,7 +127,12 @@
</mimetype>
<mimetype name="application/xhtml+xml">
<label name="application/xhtml+xml_label">
Site web (XHTML)
Page Web (XHTML)
</label>
</mimetype>
<mimetype name="application/octet-stream">
<label name="application/octet-stream_label">
Flux
</label>
</mimetype>
<mimetype name="audio/mid">

5
indra/newview/skins/default/xui/fr/mime_types_linux.xml
View File

@ -120,6 +120,11 @@
Page Web (XHTML)
</label>
</mimetype>
<mimetype name="application/octet-stream">
<label name="application/octet-stream_label">
Flux
</label>
</mimetype>
<mimetype name="audio/mid">
<label name="audio/mid_label">
Audio (MIDI)

5
indra/newview/skins/default/xui/fr/mime_types_mac.xml
View File

@ -120,6 +120,11 @@
Page Web (XHTML)
</label>
</mimetype>
<mimetype name="application/octet-stream">
<label name="application/octet-stream_label">
Flux
</label>
</mimetype>
<mimetype name="audio/mid">
<label name="audio/mid_label">
Audio (MIDI)

2
indra/newview/skins/default/xui/fr/panel_preferences_general.xml
View File

@ -3,6 +3,8 @@
<text name="language_textbox">Langue :</text>
<combo_box name="language_combobox">
<combo_box.item label="English (Anglais)" name="English"/>
<!-- <combo_box.item label="Azərbaycanca (Azerbaïdjanais)" name="Azerbaijani"/> -->
<!-- <combo_box.item label="Dansk (Danois) - Beta" name="Danish"/> -->
<combo_box.item label="Deutsch (Allemand)" name="Deutsch(German)"/>
<combo_box.item label="Español (Espagnol) - Beta" name="Spanish"/>
<combo_box.item label="Français - Beta" name="French"/>

5
indra/newview/skins/default/xui/ru/mime_types.xml
View File

@ -212,6 +212,11 @@
Видео (MP4)
</label>
</mimetype>
<mimetype name="video/x-flv">
<label name="video/x-flv_label">
Видео (flv)
</label>
</mimetype>
<mimetype name="application/octet-stream">
<label name="video/octet-stream">
Видео

5
indra/newview/skins/default/xui/ru/mime_types_linux.xml
View File

@ -202,6 +202,11 @@
Видео (MP4)
</label>
</mimetype>
<mimetype name="video/x-flv">
<label name="video/x-flv_label">
Видео (flv)
</label>
</mimetype>
<mimetype name="video/quicktime">
<label name="video/quicktime_label">
Видео (QuickTime)

5
indra/newview/skins/default/xui/ru/mime_types_mac.xml
View File

@ -202,6 +202,11 @@
Видео (MP4)
</label>
</mimetype>
<mimetype name="video/x-flv">
<label name="video/x-flv_label">
Видео (flv)
</label>
</mimetype>
<mimetype name="video/quicktime">
<label name="video/quicktime_label">
Видео (QuickTime)