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-17 17:21:57 +02:00
parent 8e9b3a8f37 9f1489a794
commit faa9ffe2b8
12 changed files with 76 additions and 26 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -10,19 +10,20 @@ env:
AUTOBUILD_VARIABLES_FILE: ${{github.workspace}}/build-variables/variables
EXTRA_ARGS: -DUSE_FMODSTUDIO=ON -DUSE_KDU=ON --crashreporting
build_secrets_checkout: ${{github.workspace}}/signing
XZ_DEFAULTS: -T0
jobs:
build_matrix:
strategy:
matrix:
os: [macos-10.15,ubuntu-20.04,windows-2022]
os: [macos-11,ubuntu-20.04,windows-2022]
grid: [sl,os]
addrsize: [64,32]
exclude:
- os: ubuntu-20.04
addrsize: 32
- os: macos-10.15
- os: macos-11
addrsize: 32
runs-on: ${{ matrix.os }}
steps:
@ -196,6 +197,12 @@ jobs:
fi
done
shell: bash
- name: make Nightly builds expire after 14 days
if: env.FS_BUILD_TYPE == 'Nightly'
run: |
echo "EXTRA_ARGS=${{ env.EXTRA_ARGS}} --testbuild=14" >> $GITHUB_ENV
- name: Clean up packages to give more space
run: rm *${{ env.fallback_platform }}*bz2
shell: bash
@ -246,18 +253,22 @@ jobs:
- name: Install discord-webhook library
run: pip install discord-webhook
- name: find channel from Branch name
- name: find channel and webhook from Branch name
run: |
if [[ "${{ github.ref_name }}" == *Release* ]]; then
FS_RELEASE_FOLDER=release
else
if [[ "${{github.event_name}}" == 'schedule' ]]; then
FS_RELEASE_FOLDER=nightly
FS_BUILD_WEBHOOK_URL=${{ secrets.RELEASE_WEBHOOK_URL }}
else
FS_RELEASE_FOLDER=preview
if [[ "${{github.event_name}}" == 'schedule' ]]; then
FS_RELEASE_FOLDER=nightly
FS_BUILD_WEBHOOK_URL=${{ secrets.NIGHTLY_WEBHOOK_URL }}
else
FS_RELEASE_FOLDER=preview
FS_BUILD_WEBHOOK_URL=${{ secrets.BETA_WEBHOOK_URL }}
fi
fi
echo "FS_RELEASE_FOLDER=${FS_RELEASE_FOLDER}" >> $GITHUB_ENV
echo "FS_BUILD_WEBHOOK_URL=${FS_BUILD_WEBHOOK_URL}" >> $GITHUB_ENV
- name: Download artifacts
uses: actions/download-artifact@v3
@ -269,7 +280,7 @@ jobs:
working-directory: ${{steps.download.outputs.download-path}}
- name: Reorganise artifacts ready for server upload.
run: python ./fsutils/download_list.py -u ${{steps.download.outputs.download-path}} -w ${{ secrets.RELEASE_WEBHOOK_URL }}
run: python ./fsutils/download_list.py -u ${{steps.download.outputs.download-path}} -w ${{ env.FS_BUILD_WEBHOOK_URL }}
- name: Setup rclone and download the folder
uses: beqjanus/setup-rclone@main

20
fsutils/download_list.py
View File

@ -80,7 +80,8 @@ def get_md5(mdfile):
#split md5sum on space
md5sum = md5sum.split()[0]
#remove leading '\'
md5sum = md5sum[1:]
if md5sum[0] == "\\":
md5sum = md5sum[1:]
print(f"generating md5sum for {mdfile} as {md5sum}")
return md5sum
@ -210,7 +211,11 @@ for build_type in build_types_created:
platforms_printable = {"windows":"MS Windows", "mac":"MacOS", "linux":"Linux"}
grids_printable = {"SL":"Second Life", "OS":"OpenSim"}
download_root = f"https://downloads.firestormviewer.org/{build_types[build_type]}/"
download_root = f"https://downloads.firestormviewer.org/{build_types[build_type]}"
output += f'''
DOWNLOADS - {build_type}
-------------------------------------------------------------------------------------------------------
'''
for dir in dirs:
print(f"Getting files for {dir} in {build_type_dir}")
files = get_files(os.path.join(build_type_dir, dir))
@ -236,11 +241,8 @@ for build_type in build_types_created:
print(f"No files found for {dir} in {build_type_dir}")
output += f'''
DOWNLOADS - {build_type}
'''
output += f'''-------------------------------------------------------------------------------------------------------
output += f'''
{platforms_printable[dir]}
'''
dir = dir.lower()
@ -266,8 +268,7 @@ DOWNLOADS - {build_type}
except KeyError:
output += f"{platform} for {grid_printable} ({wordsize}-bit) - NOT AVAILABLE\n"
output += "\n"
output += '''
-------------------------------------------------------------------------------------------------------
output += '''-------------------------------------------------------------------------------------------------------
'''
if args.webhook:
@ -276,6 +277,7 @@ DOWNLOADS - {build_type}
# Send the webhook
response = webhook.execute()
# Print the response
print(f"Webhook response: {response}")
if not response.ok:
print(f"Webhook Error {response.status_code}: {response.text}")
print(output)

8
indra/newview/llpanelprofile.cpp
View File

@ -3136,6 +3136,14 @@ void LLPanelProfileNotes::onOpen(const LLSD& key)
void LLPanelProfileNotes::setNotesText(const std::string &text)
{
// <FS:Zi> FIRE-32926 - Profile notes that are actively being edited get discarded when
// the profile owner enters or leaves the region at the same time.
if (mHasUnsavedChanges)
{
return;
}
// </FS:Zi>
mSaveChanges->setEnabled(FALSE);
mDiscardChanges->setEnabled(FALSE);
mHasUnsavedChanges = false;

10
indra/newview/llsurface.cpp
View File

@ -171,6 +171,16 @@ void LLSurface::create(const S32 grids_per_edge,
mMetersPerEdge = mMetersPerGrid * (mGridsPerEdge - 1);
// <FS:CR> Aurora Sim
sTextureSize = width;
// Trap non-power of 2 widths to avoid GLtexture issues.
if ((sTextureSize & (sTextureSize - 1)) != 0)
{
// Not a power of 2, find the next power of 2
sTextureSize = 1 << static_cast<S32>( ceil(log2(sTextureSize)) ) ;
}
// Clamp to maximum limit
sTextureSize = std::min(sTextureSize, 1024);
// </FS:CR> Aurora Sim
mOriginGlobal.setVec(origin_global);

4
indra/newview/skins/ansastorm/xui/de/floater_preview_texture.xml
View File

@ -58,9 +58,9 @@
</combo_box>
</panel>
<panel name="button_panel">
<button label="OK" name="Keep" width="120"/>
<button label="OK" name="Keep"/>
<button label="Verwerfen" name="Discard"/>
<flyout_button label="Speichern..." name="save_tex_btn" width="140">
<flyout_button label="Speichern..." name="save_tex_btn">
<flyout_button.item label="Speichern als TGA" name="save_item_tga"/>
<flyout_button.item label="Speichern als PNG" name="save_item_png"/>
</flyout_button>

4
indra/newview/skins/default/xui/de/floater_preview_texture.xml
View File

@ -30,9 +30,9 @@
<combo_box name="combo_aspect_ratio" tool_tip="Mit einem vordefinierten Seitenverhältnis anzeigen"/>
</panel>
<panel name="button_panel">
<button label="OK" name="Keep" width="120"/>
<button label="OK" name="Keep"/>
<button label="Verwerfen" name="Discard"/>
<flyout_button label="Speichern..." name="save_tex_btn" width="140">
<flyout_button label="Speichern..." name="save_tex_btn">
<flyout_button.item label="Speichern als TGA" name="save_item_tga"/>
<flyout_button.item label="Speichern als PNG" name="save_item_png"/>
</flyout_button>

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

@ -16,6 +16,13 @@
<check_box label="Actif" name="enable_media"/>
<slider label="Chat vocal" name="Voice Volume"/>
<check_box label="Actif" name="enable_voice_check_volume"/>
<text name="Listen media from">
Écouter médias et sons de :
</text>
<radio_group name="media_ear_location">
<radio_item label="Position de caméra" name="0"/>
<radio_item label="Position de l'avatar" name="1"/>
</radio_group>
<text name="auto_unmute_label">Réactiver le son après une téléportation :</text>
<check_box name="FSAutoUnmuteAmbient" label="Ambiance" tool_tip="Réactivation automatique des sons d'ambiance après une téléportation si le son est coupé (par défaut : désactivé)."/>
<check_box name="FSAutoUnmuteSounds" label="Effets sonores" tool_tip="Réactivation automatique des effets sonores après une téléportation si le son est coupé (par défaut : désactivé)"/>

3
indra/newview/skins/default/xui/fr/panel_tools_texture.xml
View File

@ -115,4 +115,7 @@
<spinner label="Décalage vertical" name="shinyOffsetV"/>
<check_box initial_value="false" label="Aligner les faces Plan" name="checkbox planar align" tool_tip="Aligner les textures sur toutes les faces sélectionnées avec la dernière face sélectionnée. Application de la texture Plan requise."/>
<button label="Aligner" label_selected="Aligner les couches de texture actuelles" name="button align textures" tool_tip="Aligner les couches de texture actuelles"/>
<button label="Trouver toutes" name="btn_select_same_diff" tool_tip="Sélectionner toutes les faces ayant la même texture diffuse que celle-ci"/>
<button label="Trouver toutes" name="btn_select_same_norm" tool_tip="Sélectionner toutes les faces ayant la même normale que celle-ci"/>
<button label="Trouver toutes" name="btn_select_same_spec" tool_tip="Sélectionner toutes les faces ayant la même spéculaire que celle-ci"/>
</panel>

3
indra/newview/skins/default/xui/pl/panel_tools_texture.xml
View File

@ -127,4 +127,7 @@
<check_box label="Równaj powierzchnie planarne" name="checkbox planar align" tool_tip="Wyrównuj tekstury na wszystkich wybranych powierzchniach z powierzchnią wybraną jako ostatnia. Wymaga planarnego mapowania tekstur." />
<check_box label="Synchronizuj materiały" name="checkbox_sync_settings" tool_tip="Synchronizuj parametry map tekstur" />
<button label="Wyrównaj" name="button align textures" tool_tip="Wyrównaj bieżące warstwy tekstury" />
<button label="Wyszukaj" name="btn_select_same_diff" tool_tip="Wybierz wszystkie powierzchnie z taką samą teksturą (diffuse) jak ta" />
<button label="Wyszukaj" name="btn_select_same_norm" tool_tip="Wybierz wszystkie powierzchnie z taką samą mapą normalnych jak ta" />
<button label="Wyszukaj" name="btn_select_same_spec" tool_tip="Wybierz wszystkie powierzchnie z taką samą mapą lśnienia (specular) jak ta" />
</panel>

6
indra/newview/skins/default/xui/ru/notifications.xml
View File

@ -3441,13 +3441,13 @@ URL: [AUDIOURL]
</form>
</notification>
<notification name="AutoUnmuteByIM">
[NAME] отправил(а) вам мгновенное сообщение и был(а) автоматически разблокирован(а).
[NAME] было отправлено мгновенное сообщение и был автоматически разблокирован.
</notification>
<notification name="AutoUnmuteByMoney">
[NAME] получил(а) деньги и был(а) автоматически разблокирован(а).
[NAME] получил деньги и был автоматически разблокирован.
</notification>
<notification name="AutoUnmuteByInventory">
[NAME] предложил(а) инвентарь и был(а) автоматически разблокирован(а).
[NAME] предложен инвентарь и был автоматически разблокирован.
</notification>
<notification name="VoiceInviteGroup">
[NAME] вступил(а) в голосовой чат с группой [GROUP].

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

@ -117,4 +117,9 @@
<check_box initial_value="false" label="Согласование" name="checkbox planar align" tool_tip="Согласование текстур на всех выбранных гранях по последней выбранной грани. Должно быть выбрано наложение по плоскостям."/>
<check_box label="Синхронизировать материалы" name="checkbox_sync_settings" tool_tip="Синхронизация параметров карты текстур" />
<button label="Выровнять" name="button align textures" tool_tip="Выровнять текущие слои текстуры" width="84" />
<!-- <FS:Zi> Find all faces with same texture -->
<button label="Найти все" name="btn_select_same_diff" tool_tip="Выбрать все грани с такой же диффузной текстурой, как у этой"/>
<button label="Найти все" name="btn_select_same_norm" tool_tip="Выбрать все грани с такой же картой нормалей, как у этой"/>
<button label="Найти все" name="btn_select_same_spec" tool_tip="Выбрать все грани с такой же картой бликов, как у этой"/>
<!-- </FS:Zi> -->
</panel>

5
requirements.txt
View File

@ -1,3 +1,4 @@
llbase==1.2.11
git+https://github.com/FirestormViewer/autobuild-3.0#egg=autobuild
llbase>=1.2.11
autobuild>=3.9.1
# git+https://github.com/FirestormViewer/autobuild-3.0#egg=autobuild
# git+https://github.com/Nicky-D/autobuild@main_nd#egg=autobuild