Andrey Kleshchev
5a0ba25d83
#4882 Log textures that failed to be created
...
A bunch of 36x36 failed to create, there shouldn't have been any 36x36
textures, log the ids/type.
2025-10-28 21:23:01 +02:00
Andrey Kleshchev
3da493295e
#4296 Crash at renderMorphMasks
2025-07-09 23:16:17 +03:00
Ansariel
9fdca96f8b
Re-enable compiler warnings C4244 and C4396 except for lltracerecording.h and llunittype.h for now
2024-07-08 20:27:14 +02:00
Ansariel
4b52dd754b
Fix incorrect use of VX/VY/VZ/VW indices when color components are accessed
2024-06-10 19:30:17 +03:00
Ansariel
e2e37cced8
Fix line endlings
2024-05-22 22:40:26 +03:00
Ansariel
1b67dd855c
Merge remote-tracking branch 'origin/main' into DRTVWR-600-maint-A
...
# Conflicts:
# autobuild.xml
# indra/cmake/CMakeLists.txt
# indra/cmake/GoogleMock.cmake
# indra/llaudio/llaudioengine_fmodstudio.cpp
# indra/llaudio/llaudioengine_fmodstudio.h
# indra/llaudio/lllistener_fmodstudio.cpp
# indra/llaudio/lllistener_fmodstudio.h
# indra/llaudio/llstreamingaudio_fmodstudio.cpp
# indra/llaudio/llstreamingaudio_fmodstudio.h
# indra/llcharacter/llmultigesture.cpp
# indra/llcharacter/llmultigesture.h
# indra/llimage/llimage.cpp
# indra/llimage/llimagepng.cpp
# indra/llimage/llimageworker.cpp
# indra/llimage/tests/llimageworker_test.cpp
# indra/llmessage/tests/llmockhttpclient.h
# indra/llprimitive/llgltfmaterial.h
# indra/llrender/llfontfreetype.cpp
# indra/llui/llcombobox.cpp
# indra/llui/llfolderview.cpp
# indra/llui/llfolderviewmodel.h
# indra/llui/lllineeditor.cpp
# indra/llui/lllineeditor.h
# indra/llui/lltextbase.cpp
# indra/llui/lltextbase.h
# indra/llui/lltexteditor.cpp
# indra/llui/lltextvalidate.cpp
# indra/llui/lltextvalidate.h
# indra/llui/lluictrl.h
# indra/llui/llview.cpp
# indra/llwindow/llwindowmacosx.cpp
# indra/newview/app_settings/settings.xml
# indra/newview/llappearancemgr.cpp
# indra/newview/llappearancemgr.h
# indra/newview/llavatarpropertiesprocessor.cpp
# indra/newview/llavatarpropertiesprocessor.h
# indra/newview/llbreadcrumbview.cpp
# indra/newview/llbreadcrumbview.h
# indra/newview/llbreastmotion.cpp
# indra/newview/llbreastmotion.h
# indra/newview/llconversationmodel.h
# indra/newview/lldensityctrl.cpp
# indra/newview/lldensityctrl.h
# indra/newview/llface.inl
# indra/newview/llfloatereditsky.cpp
# indra/newview/llfloatereditwater.cpp
# indra/newview/llfloateremojipicker.h
# indra/newview/llfloaterimsessiontab.cpp
# indra/newview/llfloaterprofiletexture.cpp
# indra/newview/llfloaterprofiletexture.h
# indra/newview/llgesturemgr.cpp
# indra/newview/llgesturemgr.h
# indra/newview/llimpanel.cpp
# indra/newview/llimpanel.h
# indra/newview/llinventorybridge.cpp
# indra/newview/llinventorybridge.h
# indra/newview/llinventoryclipboard.cpp
# indra/newview/llinventoryclipboard.h
# indra/newview/llinventoryfunctions.cpp
# indra/newview/llinventoryfunctions.h
# indra/newview/llinventorygallery.cpp
# indra/newview/lllistbrowser.cpp
# indra/newview/lllistbrowser.h
# indra/newview/llpanelobjectinventory.cpp
# indra/newview/llpanelprofile.cpp
# indra/newview/llpanelprofile.h
# indra/newview/llpreviewgesture.cpp
# indra/newview/llsavedsettingsglue.cpp
# indra/newview/llsavedsettingsglue.h
# indra/newview/lltooldraganddrop.cpp
# indra/newview/llurllineeditorctrl.cpp
# indra/newview/llvectorperfoptions.cpp
# indra/newview/llvectorperfoptions.h
# indra/newview/llviewerparceloverlay.cpp
# indra/newview/llviewertexlayer.cpp
# indra/newview/llviewertexturelist.cpp
# indra/newview/macmain.h
# indra/test/test.cpp
2024-05-22 19:04:52 +02:00
Andrey Lihatskiy
1b68f71348
#824 Process source files in bulk: replace tabs with spaces, convert CRLF to LF, and trim trailing whitespaces as needed
2024-04-29 07:56:09 +03:00
Lars Næsbye Christensen
9e854b697a
misc: BOOL to bool
2024-02-17 12:23:07 +02:00
Lars Næsbye Christensen
4419bb8709
more misc: BOOL (int) to real bool
2024-02-12 23:17:22 +02:00
Lars Næsbye Christensen
70f8dc7a4f
miscellaneous: BOOL (int) to real bool
2024-02-12 23:17:22 +02:00
Alexander Gavriliuk
74c8b028d4
SL-20743 Use LLMutex in LLImageBase for internal data thread-safety
2023-12-21 19:12:52 +01:00
Brad Linden
2f44377b3e
Merge remote-tracking branch 'origin/main' into DRTVWR-559
2023-05-17 11:17:48 -07:00
RunitaiLinden
ee0b330b2d
DRTVWR-559 Decruft deprecated OpenGL flags.
2023-05-16 20:31:29 -05:00
Fawrsk
7419037ef6
SL-18893 Fixes for pull requests #38 , #41 , and #42 ( #46 )
...
Eliminate unnecessary copies, and remove uses of auto
2023-01-10 11:43:27 +02:00
Fawrsk
74a9280c69
SL-18893 Clean up for loops in llappearance to use C++11 range based for loops ( #38 )
2023-01-03 23:08:15 +02:00
Howard (Aech Linden) Stearns
718073717c
SL-18128, SL-18128 - No glerror on Mac!
2022-09-19 12:16:49 -07:00
Andrey Lihatskiy
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
Nicky
0dc325c1e9
void LLTexLayerSet::asLLSD was never used, remove it completely.
...
(cherry picked from commit 7f0259f0e767969d260514e9ea810cbde7f1d24c)
2022-04-14 14:31:57 -04:00
Nicky
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
Dave Houlton
cf35d27dfb
DRTVWR-546 merge up to 6.5.2
2021-12-15 14:37:18 -07:00
Dave Houlton
5fcea00c4f
SL-16386 purge no-op fxn LLTexUnit::setTextureBlendType()
2021-11-30 17:04:35 -07:00
Dave Houlton
68e09edad0
SL-16386 remove references to (const true) LLGLSLShader::sNoFixedFunction
2021-11-30 17:04:35 -07:00
Dave Parks
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
Callum Prentice
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
Brad Payne (Vir Linden)
c83e740ef9
Revert "Merge branch 'master' of https://bitbucket.org/lindenlab/viewer into DRTVWR-519"
...
This reverts commit e61f485a04 , reversing
changes made to 00c47d079f .
2021-03-08 13:56:16 +00:00
Callum Prentice
d26567915c
Merge with Master after Viewer release
2021-02-03 09:31:32 -08:00
Andrey Kleshchev
5e7a0a963e
SL-14190 moved sAvatarDictionary
2020-11-03 22:12:39 +02:00
Andrey Kleshchev
99d2ae5e02
SL-14190 sAvatarDictionary was not used
2020-10-26 18:47:12 +02:00
Callum Prentice
6be1f88a5e
Complete the change from lldiskcache -> llfilesystem and then addition of new lldiskcache implementation
2020-09-24 14:45:39 -07:00
Callum Prentice
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
Callum Prentice
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
Graham Linden
41ede77744
SL-10625
2019-07-24 12:52:24 -07:00
Graham Linden
1529c16201
SL-11610
...
Revert attempted fix for 10625.
2019-07-24 10:53:04 -07:00
Graham Linden
f6eab05017
Fix OSX compiler error from missing defaulted param and changed signature of renderAlphaMaskTextures.
2019-07-15 16:02:10 -07:00
Graham Linden
946da4e507
SL-10761
...
Add work-around for broken intel drivers which can't use glReadPixels from RGBA FBOs to get alpha without locking up.
2019-07-15 15:04:48 -07:00
Graham Linden
1133160476
SL-11109
...
Make shadowAlphaMask shader ignore vertex alpha before discards iff we're a fullbright object.
Keep llappearance from stuffing dangling pointers into the alpha cache (crash iff you're using nSight debugging and disable readbacks).
2019-07-12 13:26:02 -07:00
Graham Linden
b8f64c55b7
SL-11545
...
Fix glow calcs in sky shaders (not just the not shared enough atmospherics funcs).
Revert 10625 attempted fix as it breaks baggy clothes as much as skipping readbacks does.
2019-07-12 09:34:38 -07:00
Graham Linden
6a7f12ebcf
SL-10625
...
Keep texture baking from pointlessly mercy flushing GL like a kid that just discovered the toilet handle.
Make glReadPixels call use GL_ALPHA8 (a texture format) instead of GL_ALPHA (an enum to indicate the alpha channel).
2019-07-11 13:34:32 -07:00
Graham Linden
76c41dafe9
Roll back 10625 change and continue to side-step intel readback bug.
2019-07-08 11:18:54 -07:00
Graham Linden
26bf61811b
SL-10625
...
Appease Clang.
2019-07-08 11:06:42 -07:00
Graham Linden
1d86dcd846
SL-10625 another shot across the bow
...
Move dynamic texture update (which does local back readback work) to just before swap
which may keep the Intel driver from tripping on its own shoelaces and is also subjectively faster for bakes.
2019-07-08 10:10:22 -07:00
Graham Linden
48f169423b
SL-11545, SL-11543, SL-10625
...
Fix emissives without normal maps clobbering the alpha output in materialF.
Modify glow size calc to get close to pre-EEP sun glow behavior (may require sky vert settings >= mid).
Make bake ignore alpha readback for Intel until we can determine why their drivers now go boom.
2019-07-03 10:04:05 -07:00
Graham Linden
576f1cdd7e
SL-11521, SL-10625
...
Try aligning data used for glReadPixels to see if we can coax the Intel driver stack into being a less souciant pile of detritus.
Replace face color based test replaced with other logic in error.
2019-07-01 17:23:59 -07:00
Graham Linden graham@lindenlab.com
06bce2ddd0
Add debug setting and code to allow nVidia nSight graphics debugging to capture SL frames.
...
These changes are only enabled if RenderNsightDebugSupport is true and eliminate use of
some OpenGL legacy functionality which is incompatible with nSight capture
(mostly glReadPixels and other fixed-function pipe rendering calls).
2018-02-15 21:55:24 +00:00
Brad Payne (Vir Linden)
487ca1bad3
v-r -> s-e merge WIP
2014-05-14 17:50:59 -04:00
Brad Payne (Vir Linden)
7b9708a2e3
sunshine-external merge WIP
2014-05-13 10:02:26 -04:00
Brad Payne (Vir Linden)
d9e3a2948a
merge
2014-03-12 17:24:07 -04:00
Richard Linden
5b846ed2a6
merge with release
2014-03-12 12:48:43 -07:00
Baker Linden
d7b902d575
[MAINT-3555] Crash in LLPanel::~LLPanel() on shutdown
...
- Added clear() after DeletePointer() call to hopfully fix this...
2014-02-14 13:56:36 -08:00
Xiaohong Bao
0c60e32808
Merge
2013-10-21 16:57:38 -06:00