718073717c
SL-18128, SL-18128 - No glerror on Mac!
2022-09-19 12:16:49 -07:00
197ac7cc20
Merge remote-tracking branch 'remotes/origin/DRTVWR-563' into DRTVWR-559
2022-08-30 10:46:36 -05: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
b6841d75c2
SL-17219 WIP - Texture pipeline overhaul
2022-04-15 19:02:07 -05: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
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
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
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
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
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
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
d26567915c
Merge with Master after Viewer release
2021-02-03 09:31:32 -08: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
9962df9fb7
SL-14529 Replace dynamic_cast to LLAvatarJoint with static casts
...
Replaced couple (LLAvatarJoint*) for consistency
2021-01-04 16:33:50 +02:00
792c086e91
SL-14369 Get rid of static sSkeletonXMLTree
2020-11-30 20:19:54 +02:00
0bd916d9ed
SL-14369 FIXED BugSplat Crash LLAppViewer::cleanup()
2020-11-30 15:57:44 +02:00
6397badddd
SL-14303 Wearable type label should contain translated intead of default string
...
Startup has two initStrings calls, only after second one LLtrans will return properly translated calls, but we don't want 'translated' for logging, so modified logging to not use getTypeLabel.
2020-11-13 14:58:14 +02:00
46ebe69f32
SL-14303 Fix LLWearableType to not spam in logs
2020-11-10 18:18:51 +02:00
5e7a0a963e
SL-14190 moved sAvatarDictionary
2020-11-03 22:12:39 +02:00
99d2ae5e02
SL-14190 sAvatarDictionary was not used
2020-10-26 18:47:12 +02:00
caea7260c7
SL-14142 - impostor management cleanup
2020-10-20 18:56:44 +01:00
6be1f88a5e
Complete the change from lldiskcache -> llfilesystem and then addition of new lldiskcache implementation
2020-09-24 14:45:39 -07:00
d9448c6f52
The folder where the disk cache lives was originally renamed from llvfs to llcache but @henri's suggestion that that doesn't reflect the other files in the same place and it should be llfilesystem is a good one so I changed it over
2020-09-17 09:45:06 -07:00
2e6f516411
Renamed the references to LLVFile and llvfile.* source code plus cmake scripts to use a different name - lldiskcache - since that more closely resembles what it is (or will be) now that the VFA is no more
2020-09-16 21:12:53 -07:00
3fc07dea01
First part of change to remove LLVFS from the Viewer. Consists of code changes to remove LLVFS and LLVFSThread classes along with the associated source files. The existing llvfs folder is renamed to llcache. Also includes changes to CMake script in many places to reflect changes. Eventually, llvfile source file and class will be renamed but that is not in this change.
2020-09-16 18:53:24 -07:00
ca6f092929
DRTVWR-476: Merge branch 'master' of lindenlab/viewer into DRTVWR-476-boost-1.72
2020-05-06 16:06:26 -04:00
84a7ec90b3
DRTVWR-476: Fix glitches from lindenlab/viewer master branch merge.
2020-03-26 11:00:52 -04:00
26c5950965
DRTVWR-476: Eliminate LLWearableType LLSingleton circularity.
...
LLWearableType::initSingleton() calls LLWearableDictionary::initParamSingleton().
LLWearableDictionary's constructor constructs specific WearableEntry
instances, each of which wants to translate its name string to a user-facing
label using LLWearableType::mTrans.
WearableEntry's constructor was calling LLWearableType::getInstance(). Under
circumstances we don't fully understand (recursive mutex misbehavior?), that
could hang.
Instead, pass the canonical LLWearableType instance to LLWearableDictionary's
constructor, and from there into WearableEntry's constructor.
2020-03-25 19:28:42 -04:00
2a6b48c9b0
DRTVWR-440, merge in latest from 6.3.7 release
2020-01-28 17:26:45 -07:00
dc1453af9c
Merge in from viewer-release 6.3.5
2019-11-13 16:46:27 -07:00
b52f8573e4
SL-12272 Ordered Shutdown log spam
2019-11-13 16:17:16 +02:00
e439f0366f
Merge from lindenlab/viewer-release
2019-08-29 15:43:02 +03:00
8f02fc8a66
Fix llavatarappearance merge to not use iterator in favor of C++11 lingo.
2019-08-26 13:23:25 -07:00
723f1891db
Merge 6.3.1 viewer-release
2019-08-26 12:35:18 -07:00
3c552696bf
DRTVWR-493 LLWearableType to LLParamSingleton
2019-08-12 22:56:15 +03:00
76128c4357
SL-10566 Use vector for some high-traffic, low-item count containers instead of list.
...
Provide method of storing joint indices sep from weight data for faster runtime processing.
2019-08-05 12:04:29 -07:00
Howard (Aech Linden) Stearns