63238d1fbe
Merge branch 'DRTVWR-544-maint' of https://bitbucket.org/lindenlab/viewer
...
# Conflicts:
# indra/cmake/Copy3rdPartyLibs.cmake
# indra/cmake/FMODSTUDIO.cmake
# indra/newview/llappviewer.cpp
# indra/newview/llviewerregion.cpp
# indra/newview/viewer_manifest.py
2022-03-01 19:19:48 +01:00
a74de2d794
Merge branch 'master' of https://vcs.firestormviewer.org/phoenix-firestorm
2022-03-01 19:14:31 +01:00
e10dea5fe2
Merge branch 'master' of https://vcs.firestormviewer.org/phoenix-firestorm
2022-03-01 18:09:12 +01:00
617c01e26b
Linux; remove setting of proxy info till dullahan gets an update.
2022-03-01 13:20:43 +01:00
97a103255e
Merge branch 'master' (DRTVWR-557) into DRTVWR-546
...
# Conflicts:
# autobuild.xml
# doc/contributions.txt
# indra/cmake/GLOD.cmake
# indra/llcommon/tests/llprocess_test.cpp
# indra/newview/VIEWER_VERSION.txt
# indra/newview/lldrawpoolavatar.cpp
# indra/newview/llfloatermodelpreview.cpp
# indra/newview/llmodelpreview.cpp
# indra/newview/llviewertexturelist.cpp
# indra/newview/llvovolume.cpp
# indra/newview/viewer_manifest.py
2022-03-01 13:41:42 +02:00
b4a5bf0e8c
merge conflict fix
2022-03-01 13:40:03 +02:00
25f974d77d
Merge branch 'master' of https://vcs.firestormviewer.org/phoenix-firestorm
2022-03-01 10:00:36 +01:00
9ee728f51d
Merge branch 'master' of https://vcs.firestormviewer.org/phoenix-firestorm
2022-03-01 09:53:51 +01:00
2dc899a698
Replace hg with git, as mercurial isn't used for ages anymore
2022-03-01 09:33:23 +01:00
b325b0e08a
Merge branch 'master' of https://bitbucket.org/lindenlab/viewer
2022-03-01 08:38:39 +01:00
c5e258f40f
Merge branch 'master' of https://vcs.firestormviewer.org/phoenix-firestorm
2022-03-01 08:38:19 +01:00
fa9d4927f4
Merge remote-tracking branch 'NickyD/viewer-cleanup:master' into DRTVWR-543-maint
...
# Conflicts:
# autobuild.xml
2022-03-01 02:59:15 +02:00
130d0c0704
Merge branch 'master' of bitbucket.org:lindenlab/viewer into SL-9749
2022-02-28 15:54:23 -08:00
932b7de530
SL-9748 - Handle submesh case of resuseable physics model.
2022-02-28 15:47:56 -08:00
df00e8a0b2
There seems to be a reluctance to kill boost for VS2005(!), lets get rid
...
of it.
2022-02-28 23:23:31 +01:00
6906582401
Calling a method on a pointer that is 100% certain to be inalid is a
...
really bad idea ...
2022-02-28 22:23:05 +01:00
35cec6e3ad
Initialize PODs with 0 and not leave anyting to chance.
2022-02-28 22:20:41 +01:00
43031968a6
Merge remote-tracking branch 'll/master'
2022-02-28 22:04:05 +01:00
7f315b1552
Merge branch 'master' into DRTVWR-486
2022-02-28 22:02:26 +02:00
e70fe3a50d
Merge branch 'master' into DRTVWR-483
...
# Conflicts:
# indra/newview/llviewermenu.cpp
2022-02-28 22:01:18 +02:00
f62579f293
Merge branch 'master' into DRTVWR-548-maint-N
2022-02-28 21:56:33 +02:00
1e0eafd50c
Merge branch 'master' into DRTVWR-544-maint
...
# Conflicts:
# indra/llaudio/llstreamingaudio_fmodstudio.cpp
# indra/newview/llviewerregion.cpp
2022-02-28 21:56:25 +02:00
201f83472c
Merge branch 'master' into DRTVWR-543-maint
2022-02-28 21:55:28 +02:00
73eec89131
Merge branch 'master' into DRTVWR-540-maint
...
# Conflicts:
# autobuild.xml
# indra/llcommon/llsys.cpp
# indra/newview/app_settings/key_bindings.xml
# indra/newview/llfloatereditextdaycycle.cpp
2022-02-28 21:54:21 +02:00
6ca09a9455
Increment viewer version to 6.5.4
...
following promotion of DRTVWR-557
2022-02-28 14:45:27 -05:00
1f1d762693
SL-16939 FIXED Graphics driver version is not displayed for Portuguese language
2022-02-28 13:18:53 +02:00
3ad6b91c4f
Fix packaging fail in case system canot create a app image (not ubuntu)
2022-02-28 00:21:45 +01:00
5f46403903
FIRE-31434 Update Russian translation, by Romka Swallowtail
2022-02-27 20:48:31 +01:00
6bd264e181
Update German translation
2022-02-27 00:11:40 +01:00
65182c28a8
Merge branch 'master' of https://vcs.firestormviewer.org/phoenix-firestorm
2022-02-26 22:07:09 +01:00
46205822c4
Updated Polish translation for the perfomance floater rework, fixing minor mistakes in English one
2022-02-26 22:07:02 +01:00
1168b43580
Windows; use VS_DEBUGGER_WORKING_DIRECTORY to get rid of vstool if
...
possible. Enable by passing --no-vstool to configure
2022-02-26 13:55:14 +01:00
b8725fd709
Windows; set /bigobj compiler flag to llappviwer.cpp and
...
llviewermenu.cpp.
2022-02-26 13:12:08 +01:00
a0c33641a3
FIRE-31391 & FIRE 31397 Various perf floater cosmetic and behaviour updates
...
* allow user to disable continuous tuning, viewer will try to reach a stable target then stop tuning.
* Save/Load graphics presets.
* reset to graphics defaults
* alter layout to be more intuitive, guided by user feedback
* various minor grammar and spelling consistency changes
2022-02-26 02:43:39 +00:00
694cd657ec
Ensure static qualifier is applied to constexpr
2022-02-26 02:43:39 +00:00
3d10623787
wip - updates based on feedback
2022-02-26 02:43:39 +00:00
9210ec8a82
SL-9748 - Apply explicitly given physics shape only if the usual rules do not.
2022-02-25 18:32:55 -08:00
0ccb6f80be
A follow-up: panel.strings to strings
2022-02-26 01:34:24 +01:00
be4b1fbd42
Add missing string in login panel, in Latency skin
2022-02-26 01:04:07 +01:00
92c302d6fb
SL-15940 Verify triangle limit
...
to not trigger an assert inside meshoptimizer
2022-02-25 18:56:54 +02:00
c141ecdcc2
SL-3787 Fixed sloppy mode returning invalid model
...
In automatic mode for simple models gradualy increase sloppy decimator until something valid is found.
2022-02-25 13:51:19 +02:00
641ade57c2
Fix up filename for linux appimage to be a useful filename.
2022-02-24 20:07:45 -08:00
9d81eaf1c1
FIRE-31391 (parts), FIRE-31396 (water does not settle)
...
Various changes to stabilise the rate of change and smooth the behaviour. Also Fixes an outright bug where the water change check was not working as expected which is likely related to Hilary's comment on FIRE-31391
2022-02-24 21:52:00 +00:00
611869b103
Merged in SL-16857 (pull request #876 )
...
SL-16857: Provide parcel border information to the mini-map
Approved-by: Andrey Lihatskiy
Approved-by: Vir Linden
2022-02-24 21:51:02 +00:00
cf1f63f938
FIRE-31417 - Autotune thread collision on settings access crashing win
...
also FIRE-31326 and comments on summary Jira
2022-02-24 21:48:16 +00:00
61947deccd
FIRE-31425 - Distance based avatar filtering is confusing some users
...
The feature is now disabled by default. I can be a useful feature when in a densely packed event but is overkill for most use cases.
2022-02-24 21:36:18 +00:00
f856483c12
Merged in SL-16917 (pull request #886 )
...
SL-16917: Move cardinal directions to the edge of the minimap
Approved-by: Andrey Lihatskiy
Approved-by: Vir Linden
2022-02-24 21:12:20 +00:00
696795a368
SL-16910 Fix Mac not selecting a joystick
2022-02-24 22:58:38 +02:00
ba6ca8d45f
Merge branch 'DRTVWR-546' of ssh://bitbucket.org/lindenlab/viewer into DRTVWR-546
2022-02-24 13:05:07 -06:00
658a30bd2e
SL-16907 Potential fix for crash in updateSkinInfoMatrixPalette
2022-02-24 13:04:40 -06:00
Ansariel