85f2447b3d
Merge branch 'main' into marchcat/a-merge
...
# Conflicts:
# autobuild.xml
# indra/llimage/llimage.cpp
# indra/llui/llsearcheditor.cpp
# indra/llui/llview.cpp
# indra/newview/llagent.cpp
# indra/newview/llappviewer.cpp
# indra/newview/llfloatercamera.cpp
# indra/newview/llfloatereditsky.cpp
# indra/newview/llfloatereditwater.cpp
# indra/newview/llinventoryfunctions.cpp
# indra/newview/lloutfitgallery.cpp
# indra/newview/lloutfitslist.cpp
# indra/newview/llpanelgroupbulkban.cpp
# indra/newview/llsidepanelappearance.cpp
# indra/newview/llvovolume.cpp
2024-04-24 19:28:15 +03:00
d98fc504a1
Increment viewer version to 7.1.7
...
following promotion of secondlife/viewer #736
2024-04-24 09:43:07 -04:00
fc71a9c1ed
Merge release/maint-yz to main on promotion of secondlife/viewer #736 : Maintenance YZ 7.1.6.8745209917
2024-04-24 09:43:04 -04:00
398369233f
viewer#1117 optimize one getIsCloud() away
...
getIsCloud() is relatively expensive, especially for 'self', yet
getRezzedStatus() already checks it and return 0, no need to repeat.
2024-04-19 00:58:43 +03:00
5e40b5e644
Revert "SL-20140 Setting shape hand size to 36 won't save"
...
This reverts commit 810a3d24c2secondlife/jira-archive-internal#70482 )
2024-04-19 00:54:51 +03:00
a0c52be079
Revert "SL-20140 Setting shape hand size to 36 won't save"
...
This reverts commit 810a3d24c2secondlife/jira-archive-internal#70482 )
2024-04-19 00:50:27 +03:00
a3cbd41543
Merge pull request #1246 from secondlife/vir-linden-patch-2
...
https://github.com/secondlife/viewer/issues/1214 - Update cla.yaml
2024-04-16 12:28:25 -04:00
b340042a3f
https://github.com/secondlife/viewer/issues/1214 - Update cla.yaml
2024-04-16 12:19:09 -04:00
7332412982
viewer#676 Use attacment info for rez state reporting
2024-04-15 23:44:06 +03:00
5a36f17f25
Merge pull request #1236 from secondlife/marchcat/yz-merge
...
Marchcat/yz merge
2024-04-15 20:09:17 +03:00
0f1f6580be
Merge branch 'main' into marchcat/yz-merge
2024-04-15 20:06:28 +03:00
11bffc8252
CI: adopt xz compression
...
Move towards packaging artifacts with xz, which offers higher compression ratios and faster decode time.
2024-04-15 20:02:18 +03:00
f8c7933f30
CI: Remove python-version from matrix
...
Drop python version from matrix configuration as it's always 3.11.
2024-04-15 20:02:18 +03:00
970531b483
Remove unused fix-incredibuild.py
2024-04-15 20:02:18 +03:00
e1f9356e91
Remove BuildParams
...
This file is no longer used.
2024-04-15 20:02:18 +03:00
eee39a9654
Merge branch 'main' into DRTVWR-600-maint-A
2024-04-15 19:40:46 +03:00
7507abb566
Merge pull request #1198 from secondlife/signal/xz
...
CI: adopt xz compression, actions/*-artifact@v4
2024-04-12 07:44:47 -07:00
0f94ea86d4
CI: adopt xz compression
...
Move towards packaging artifacts with xz, which offers higher compression ratios and faster decode time.
2024-04-11 15:18:42 -07:00
dfbbad813f
Merge pull request #1204 from Ansariel/DRTVWR-600-maint-A
...
Merge main into maint-A
2024-04-12 00:12:30 +03:00
d0102af56d
Merge branch 'main' of https://github.com/secondlife/viewer into DRTVWR-600-maint-A
...
# Conflicts:
# indra/llcommon/llapp.cpp
# indra/llcommon/llapp.h
# indra/llimage/llimageworker.cpp
# indra/llui/llcontainerview.cpp
# indra/llui/llcontainerview.h
# indra/llui/llkeywords.cpp
# indra/llui/lltabcontainer.cpp
# indra/llui/lltextbase.cpp
# indra/newview/llappviewer.cpp
# indra/newview/llfavoritesbar.cpp
# indra/newview/llfavoritesbar.h
# indra/newview/llfloaterimnearbychathandler.cpp
# indra/newview/llfloaterpreference.cpp
# indra/newview/llhudnametag.h
# indra/newview/llinventorypanel.cpp
# indra/newview/llinventorypanel.h
# indra/newview/llmeshrepository.cpp
# indra/newview/lloutfitgallery.cpp
# indra/newview/lloutfitslist.cpp
# indra/newview/llpaneleditwearable.cpp
# indra/newview/llpanelprofilepicks.cpp
# indra/newview/llpanelvoicedevicesettings.h
# indra/newview/llpreviewscript.cpp
# indra/newview/llpreviewscript.h
# indra/newview/llselectmgr.cpp
# indra/newview/lltranslate.cpp
# indra/newview/llviewerassetupload.cpp
# indra/newview/llviewermessage.cpp
2024-04-11 21:59:38 +02:00
cc8fdf341d
Merge pull request #1197 from secondlife/signal/rm-incredibuild.py
...
Remove unused fix-incredibuild.py
2024-04-11 11:32:38 -07:00
c070f23547
Merge pull request #1095 from secondlife/signal/rm-buildparams
...
Remove BuildParams
2024-04-11 11:32:12 -07:00
4b24c32678
Merge pull request #1199 from secondlife/signal/rm-py-matrix
...
CI: Remove python-version from matrix
2024-04-11 11:32:00 -07:00
7fa24d636e
CI: Remove python-version from matrix
...
Drop python version from matrix configuration as it's always 3.11.
2024-04-11 00:16:17 -07:00
72d46037bd
Remove unused fix-incredibuild.py
2024-04-10 21:21:09 -07:00
5118ba7adf
Merge pull request #1179 from secondlife/marchcat/y-merge
...
Release (Maint W) -> Maint YZ merge
2024-04-10 10:29:47 +03:00
84dfe55810
Merge branch 'main' into marchcat/y-merge
...
# Conflicts:
# autobuild.xml
# indra/llcommon/llsys.cpp
2024-04-10 07:08:25 +03:00
da9a1dcb55
Increment viewer version to 7.1.6
...
following promotion of secondlife/viewer #690
2024-04-09 17:14:13 -04:00
17e1f3692c
Port from JsonCPP to Boost.Json for json parsing and serializing ( #1054 )
2024-04-06 02:03:58 +03:00
7dbdfda7d6
SL-19585 Fix openal exit failure logging
2024-04-05 23:48:49 +03:00
d9d180aa00
viewer#1117 Use attacment info for declouding logic
2024-04-04 23:42:25 +03:00
f17d86889f
secondlife/viewer#984 BugSplat Crash: LLLoadedCallbackEntry::removeTexture(146)
2024-04-04 19:10:53 +02:00
d9f7cd36a7
Switch to 3p-boost repo built libs
2024-04-01 10:28:17 +03:00
cf45bf5f6e
Add boost 1.84.0, boost.json
...
Update boost from 1.81.0 (2022) to 1.84.0 (2023) and enable the
`boost.json` module so that it can replace rapidjson.
2024-04-01 10:28:17 +03:00
2b1e372f76
Remove BuildParams
...
This file is no longer used.
2024-03-30 21:21:55 -07:00
53d4fcd359
Remove dead googlemock dependency and related setup code
2024-03-28 19:41:47 +02:00
32c24ffbd7
Fix merge issues
2024-03-27 15:48:33 +02:00
16e638db97
Merge pull request #1062 from secondlife/marchcat/yz-merge
...
Merge main into maint YZ
2024-03-27 10:12:53 +02:00
990c8b81da
Merge branch 'main' into marchcat/yz-merge
2024-03-27 01:40:12 +02:00
71ed19839e
Merge branch 'main' into DRTVWR-600-maint-A
...
# Conflicts:
# indra/newview/llappviewer.cpp
# indra/newview/llfloaterchangeitemthumbnail.cpp
# indra/newview/llpanelprofile.cpp
# indra/newview/llselectmgr.cpp
# indra/newview/lltexturectrl.cpp
# indra/newview/lltexturectrl.h
# indra/newview/lltooldraganddrop.cpp
# indra/newview/llviewerdisplay.cpp
# indra/newview/llvovolume.cpp
2024-03-27 00:45:06 +02:00
78174fc865
Merge remote-tracking branch 'origin/main' into DRTVWR-588-maint-W
...
# Conflicts:
# .github/workflows/build.yaml
2024-03-27 00:14:56 +02:00
9567393f80
Increment viewer version to 7.1.5
...
following promotion of secondlife/viewer #650
2024-03-26 16:56:26 -04:00
c810a409e2
Merge GLTF PBR Maint 2 to main.
2024-03-26 16:55:32 -04:00
f815b015ce
secondlife/jira-archive-internal#69593 Avatar is upside down when viewed from below
2024-03-26 19:06:30 +01:00
689ef94425
viewer#1033 Crash at syncFloaterTabOrder
2024-03-24 18:32:22 +02:00
757655d7c3
Revert "SL-20416 Fix Crash Report 1409376 (update)"
...
This reverts commit cc43f42e6b
2024-03-24 18:32:22 +02:00
5ac0b9debc
viewer#951 Crash at LLScrollingPanelParam::draw
...
I'm not sure what causes this, but
1. Calling expensive getChild inside draw is not a good idea
2. I hope that simplified draw will capture a bit more info in bugsplat
or will shift callctack elsewhere
2024-03-24 18:31:32 +02:00
61935a13f4
Add Develop menu option 'Debug Camera Controls'
2024-03-22 16:41:41 +01:00
3ba9e1c5e5
viewer#888 Washed out letters in a running string
2024-03-22 17:29:25 +02:00
73318bbc6a
viewer#1018 Crash at insertStringNoUndo
...
getEditableIndex retuns pos as is if only one segment is present
2024-03-20 23:39:09 +02:00
Andrey Lihatskiy