a0915f707d
Merge branch 'DRTVWR-548-maint-N' of https://bitbucket.org/lindenlab/viewer
2022-08-02 12:51:33 +02:00
2a48c19530
SL-17828 Crash at LLPolyMorphData::loadBinary
...
These files are usually prepackaged with viewer, either all issues should lead to an error or all issues should use warns. I don't think it is a critical issue, so instead of crashing, printing out filename.
2022-07-27 08:43:25 +03:00
2c0edbac18
Merge branch 'master' of https://vcs.firestormviewer.org/viewer-merges/phoenix-firestorm-ll-master
2022-06-29 22:04:20 +02:00
2e837e5389
Merge branch 'master' into DRTVWR-548-maint-N
...
# Conflicts:
# doc/contributions.txt
# indra/newview/llviewercontrol.cpp
2022-06-29 20:51:08 +03:00
6ccdf5545d
Merge branch 'master' of https://vcs.firestormviewer.org/viewer-merges/phoenix-firestorm-546
...
# Conflicts:
# autobuild.xml
# indra/llcommon/CMakeLists.txt
# indra/llrender/llgl.cpp
# indra/newview/llappviewer.cpp
# indra/newview/llface.cpp
# indra/newview/llflexibleobject.cpp
# indra/newview/llvovolume.cpp
2022-05-27 11:41:45 +02:00
3da7a50b71
Merge branch 'master' into DRTVWR-543-maint
...
# Conflicts:
# autobuild.xml
# indra/cmake/LLCommon.cmake
# indra/llcommon/CMakeLists.txt
# indra/llrender/llgl.cpp
# indra/newview/llappviewer.cpp
# indra/newview/llface.cpp
# indra/newview/llflexibleobject.cpp
# indra/newview/llvovolume.cpp
2022-05-27 02:51:33 +03:00
5cdd8cdb6e
Merge branch 'master' of https://vcs.firestormviewer.org/viewer-merges/phoenix-firestorm-546
2022-05-26 11:43:21 +02:00
91606c7b60
Merge branch 'master' into DRTVWR-548-maint-N
2022-05-26 03:07:05 +03:00
b96f92f884
Merge branch 'DRTVWR-548-maint-N' of https://bitbucket.org/lindenlab/viewer
2022-05-19 20:31:00 +02:00
f7edcab9c3
SL-288, SL-10163 - allow joint aliases, but otherwise reject upload of animations containing invalid joint names
...
# Conflicts:
# indra/newview/llviewerassetupload.cpp
# indra/newview/llvoavatar.cpp
2022-05-18 23:25:51 +03:00
c1a4be7dae
Merge branch 'DRTVWR-543-maint' of https://bitbucket.org/lindenlab/viewer
...
# Conflicts:
# autobuild.xml
# indra/cmake/Boost.cmake
# indra/llappearance/lltexlayer.cpp
# indra/llinventory/llparcel.cpp
# indra/newview/app_settings/settings.xml
# indra/newview/llappviewer.cpp
# indra/newview/llface.cpp
# indra/newview/llviewertexturelist.cpp
# indra/newview/llvovolume.cpp
2022-04-19 13:21:52 +02:00
0dc325c1e9
void LLTexLayerSet::asLLSD was never used, remove it completely.
...
(cherry picked from commit 7f0259f0e767969d260514e9ea810cbde7f1d24c)
2022-04-14 14:31:57 -04:00
46824ae0e8
Semicolon at end of for loop was making sure nothing ever got done.
...
The whole methode is questionable in doing nothing and it seems there was a deliberate change
that made sure it does nothing. I am not sure what this method really is supposed to do, thus I did opt
for the most basic version of "do nothing" like it was before.
(cherry picked from commit 1c1a93e42e209e959f09ec46ca414a8936f4ac20)
2022-04-14 14:31:57 -04:00
cf35d27dfb
DRTVWR-546 merge up to 6.5.2
2021-12-15 14:37:18 -07:00
028941652b
Merge branch 'DRTVWR-546' of https://bitbucket.org/lindenlab/viewer
...
# Conflicts:
# indra/llrender/llvertexbuffer.cpp
# indra/newview/app_settings/settings.xml
# indra/newview/llappviewer.cpp
# indra/newview/llappviewer.h
# indra/newview/llfloaterpreference.cpp
# indra/newview/llnetmap.cpp
# indra/newview/llspatialpartition.cpp
# indra/newview/llviewerdisplay.cpp
# indra/newview/llviewershadermgr.cpp
# indra/newview/pipeline.cpp
2021-12-01 22:29:25 +01:00
5fcea00c4f
SL-16386 purge no-op fxn LLTexUnit::setTextureBlendType()
2021-11-30 17:04:35 -07:00
68e09edad0
SL-16386 remove references to (const true) LLGLSLShader::sNoFixedFunction
2021-11-30 17:04:35 -07:00
c2f8517118
Merge branch 'master' of https://vcs.firestormviewer.org/phoenix-firestorm
2021-11-16 21:01:05 +01:00
353329c2c2
DRTVWR-546 merge in master v6.5.1
2021-11-16 11:44:55 -07:00
0bffd3d365
Merge branch 'master' into DRTVWR-519
...
# Conflicts:
# README.md
2021-11-16 01:21:05 +02:00
63cc972499
Merge branch 'DRTVWR-546' of https://bitbucket.org/lindenlab/viewer
...
# Conflicts:
# indra/llappearance/lldriverparam.h
# indra/llcommon/llmemory.h
# indra/llcommon/llprofiler.h
# indra/llrender/llvertexbuffer.cpp
# indra/llwindow/llwindow.cpp
# indra/llwindow/llwindowwin32.h
# indra/newview/app_settings/settings.xml
# indra/newview/lldrawable.cpp
# indra/newview/lldrawable.h
# indra/newview/lldrawpoolalpha.cpp
# indra/newview/lldrawpoolavatar.cpp
# indra/newview/lldrawpooltree.cpp
# indra/newview/lldrawpoolwater.cpp
# indra/newview/llface.cpp
# indra/newview/llinventoryfilter.cpp
# indra/newview/llselectmgr.h
# indra/newview/llspatialpartition.cpp
# indra/newview/llviewermenu.cpp
# indra/newview/llviewerobject.cpp
# indra/newview/llvieweroctree.cpp
# indra/newview/llviewertexturelist.cpp
# indra/newview/llvovolume.cpp
# indra/newview/llvowlsky.cpp
# indra/newview/pipeline.cpp
# indra/newview/skins/default/xui/en/floater_stats.xml
2021-11-12 17:31:39 +01:00
8d20480c5f
SL-16148 SL-16244 SL-16270 SL-16253 Remove most BlockTimers, remove LLMemTracked, introduce alignas, hook most/all reamining allocs, disable synchronous occlusion, and convert frequently accessed LLSingletons to LLSimpleton
2021-10-28 18:06:21 +00:00
40e8c0a192
Merge branch 'master' of https://vcs.firestormviewer.org/phoenix-firestorm
2021-06-08 18:58:22 +02:00
ad9ed0a94d
Merge with tip of Master after Viewer release
2021-06-07 18:55:00 -07:00
a4595bdaf2
Merge branch 'master' into DRTVWR-521-maint
...
# Conflicts:
# doc/contributions.txt
2021-06-07 21:04:32 +03:00
303feae305
Merge branch 'master' v6.4.17 into DRTVWR-525
2021-03-10 09:34:16 -07:00
168d177197
This set of changes reverts the merge with master (git revert c83e740) and results in a version of the DRTVWR-519 that matches what was presemt before it was deployed as a release viewer *plus* 3 small fixes from Maxim (See commits). This branch can now be used for additional fixes before eventually being used to release D-519 as normal
2021-03-09 14:39:51 -08:00
8d5f5b4ced
Merge branch 'master' into DRTVWR-521-maint
2021-03-09 22:00:01 +02:00
c83e740ef9
Revert "Merge branch 'master' of https://bitbucket.org/lindenlab/viewer into DRTVWR-519"
...
This reverts commit e61f485a0400c47d079f
2021-03-08 13:56:16 +00:00
3804ec1d03
Merge branch 'master' of https://vcs.firestormviewer.org/phoenix-firestorm
2021-03-04 08:35:13 +01:00
e3cb162f51
Merge branch 'master' of https://vcs.firestormviewer.org/phoenix-firestorm
2021-03-03 22:05:58 +01:00
6b6b116fd4
Merge branch 'master' of https://bitbucket.org/lindenlab/viewer
2021-03-03 00:20:02 +01:00
363bc9d9d0
Merge branch 'master' v 6.4.15 into DRTVWR-525
2021-03-02 14:25:36 -07:00
9ba43b5ce9
Merge branch 'master' into DRTVWR-521-maint
2021-03-02 21:42:32 +02:00
0a9cee37f0
Merge branch 'master' of https://vcs.firestormviewer.org/phoenix-firestorm
2021-02-18 17:52:10 +01:00
7362cbf117
Merge branch 'master' of https://vcs.firestormviewer.org/phoenix-firestorm
2021-02-18 11:56:46 +01:00
a951a2ae35
Merge branch 'master' v6.4.14 into DV525-merge-6.4.14
2021-02-17 14:17:35 -07:00
57c560fa0e
Merge branch 'master' into DRTVWR-521-maint
2021-02-17 21:23:31 +02:00
e61f485a04
Merge branch 'master' of https://bitbucket.org/lindenlab/viewer into DRTVWR-519
2021-02-17 09:51:18 -08:00
abc27703e6
Merge branch 'master' of https://vcs.firestormviewer.org/phoenix-firestorm
2021-02-03 22:50:13 +01:00
1833418233
Merge branch 'master' of https://vcs.firestormviewer.org/phoenix-firestorm
2021-02-03 19:05:20 +01:00
d26567915c
Merge with Master after Viewer release
2021-02-03 09:31:32 -08:00
24e4b6867a
Merge branch 'master' of https://vcs.firestormviewer.org/phoenix-firestorm
2021-02-02 15:00:04 +01:00
f07b332ef0
Merge branch 'master' into DV525-merge-6.4.13
2021-02-01 15:59:08 -07:00
665598a5ba
Merge remote-tracking branch 'origin/master' into DRTVWR-517
2021-02-01 20:20:33 +00:00
185082f1bb
Merge branch 'master' into DRTVWR-521-maint
...
# Conflicts:
# indra/newview/llappviewer.cpp
2021-02-01 22:14:44 +02:00
93f1998a47
Merge branch 'DRTVWR-525' of https://bitbucket.org/lindenlab/viewer
2021-01-08 23:06:41 +01:00
9962df9fb7
SL-14529 Replace dynamic_cast to LLAvatarJoint with static casts
...
Replaced couple (LLAvatarJoint*) for consistency
2021-01-04 16:33:50 +02:00
d8ec51961f
Merge branch 'DRTVWR-517' of https://bitbucket.org/lindenlab/viewer
2020-12-10 19:40:18 +01:00
15bbf6510c
Merge branch 'DRTVWR-521-maint' of https://bitbucket.org/lindenlab/viewer
2020-12-09 13:14:39 +01:00
Ansariel