summaryrefslogtreecommitdiff
path: root/indra
AgeCommit message (Collapse)Author
2024-01-04DRTVWR-589: Merge branch 'main' into DRTVWR-589Nat Goodspeed
2023-12-14Increment viewer version to 7.1.2Nat Goodspeed
following promotion of DRTVWR-587
2023-11-30Merge branch 'main' into DRTVWR-587-maint-VAndrey Lihatskiy
2023-11-29increment viewer version after DRTVWR-559 releaseBrad Linden
2023-11-29Merge branch 'DRTVWR-559' into marchcat/587-v-pbr-mergeAndrey Lihatskiy
# Conflicts: # indra/llcommon/CMakeLists.txt # indra/newview/llspatialpartition.cpp # indra/newview/llviewergenericmessage.cpp # indra/newview/llvoavatar.cpp
2023-11-21SL-20411 Fix texture preview images not always loadingAndrey Kleshchev
Likely happened because some textures had 0 height width initially, but this is for UI/preview so request maximum either way.
2023-11-21SL-20411 Don't load all thumnails at once for large folders #2Andrey Kleshchev
2023-11-21SL-20411 Thumbnail textures should have less of an impact on performance #1Andrey Kleshchev
scale thumbnail textures down to 256 when needed. As we do to chat icons. # Conflicts: # indra/newview/llviewertexture.cpp
2023-11-13Drtvwr 596 11/8/2023 (#501)RunitaiLinden
* SL-20570 Fix for lossy (and square) normal maps when importing GLTF materials. * SL-20582 Fix for overriding to alpha mode blend not working. Incidental decruft of dead code (thanks, Rye!)
2023-11-09DRTVWR-589 - don't prevent mangling names as we use C++ libMnikolenko Productengine
2023-11-06SL-19968 disabled pump_idle_network for now due to it causing several ↵Brad Linden
failures during login also added suggested continue statements, and removed obsolete LLInventoryItem::fromLLSD deserialization codepath.
2023-11-06SL-20523 Ensure override gets updated before render materialAndrey Kleshchev
2023-11-06SL-20523 Local textures not updating on PBR Materials #5Andrey Kleshchev
2023-11-06SL-20523 Local textures not updating on PBR Materials #4Andrey Kleshchev
2023-11-06SL-20523 Local textures not updating on PBR Materials #3Andrey Kleshchev
2023-11-06SL-20523 Local textures not updating on PBR Materials #2Andrey Kleshchev
2023-11-06SL-20523 Local textures not updating on PBR Materials #1Andrey Kleshchev
Update editor in which texture changed to local
2023-11-03Merge branch brad/SL-19968-inventory-skel-background into ↵Brad Linden
'origin/DRTVWR-559' (#489)
2023-11-03Fix build error from overly fancy tracy macro usage that nobody else is ↵Brad Linden
using for DRTVWR-559
2023-11-03Fixed INV_THUMBNAIL_LABEL handling missed in rebase for SL-19968 workBrad Linden
2023-11-03Fix for SL-19968 objects missing timing bug due to stall during loginBrad Kittenbrink (Brad Linden)
ensure inventory skeleton loading doesn't block the message system from processing packets.
2023-11-03Merge branch 'DRTVWR-559' of ssh://github.com/secondlife/viewer into DRTVWR-559Dave Parks
2023-11-03DRTVWR-559 Fix for mac build.Dave Parks
2023-11-03Merge branch 'DRTVWR-559' of github.com:secondlife/viewer into DRTVWR-559RunitaiLinden
2023-11-03SL-20567 Default HiDPI off (mac performance improvement)RunitaiLinden
2023-11-02DRTVWR-589: Update Lualibs.cmake to use lua54.lib from 3p-lua.Nat Goodspeed
Also remove #pragma comment(lib, "liblua54.a") from relevant source files.
2023-11-02SL-20561 Rename Blinn Phong to Textures in the build floaterMnikolenko Productengine
2023-11-02Merge branch 'DRTVWR-559' of ssh://github.com/secondlife/viewer into DRTVWR-559Dave Parks
2023-11-02SL-19979 Fix for frame stalls on mac with shadows enabled. Also fix ↵Dave Parks
multihreaded GL not working on mac (thanks, Rye!)
2023-11-02DRTVWR-589: Switch to the lua package built by new 3p-lua repo.Nat Goodspeed
Also ditch crufty CMake logic related to lleventhost, which we haven't used for years.
2023-11-02DRTVWR-589: StringVec's operator<<() overload must precede lltut.h.Nat Goodspeed
If not, the resulting error message is so mysterious that it's worth adding an error check to explain how to avoid it.
2023-11-01Merge pull request #486 from secondlife/SL-20397cosmic-linden
SL-20397: Fix material set from script not updating when the GLTF material has non-default texture transforms
2023-10-31SL-20397: Fix material set from script not updating when the GLTF material ↵Cosmic Linden
has non-default texture transforms
2023-10-31SL-20548 Fix revert of materials not working properly in some casesAndrey Kleshchev
2023-10-31SL-20549 Blank no-copy materials are not moved into scripted objectsAndrey Kleshchev
2023-10-31SL-19979 Temporary hack "fix" for performance issues on Mac -- never ↵Dave Parks
implicitly enable reflection probes or shadows.
2023-10-31SL-19592 Fix for PBR alpha HUDs sometimes using wrong texture on OSXDave Parks
2023-10-30Revert "DRTVWR-587 Bring back the previously reverted change"Andrey Lihatskiy
This reverts commit 9d49edbc48d81f820870d43edb2c975beffa5485.
2023-10-30DRTVWR-587 Bring back the previously reverted changeAndrey Lihatskiy
2023-10-30SL-20541 Reorder radio buttons in Edit tools Texture tab to match order in a ↵Maxim Nikolenko
Material
2023-10-29DRTVWR-589: Unify hexdump.h headers from different branches.Nat Goodspeed
2023-10-29DRTVWR-589: Merge branch 'main' of viewer-private into DRTVWR-589Nat Goodspeed
2023-10-29DRTVWR-587: Fix LL::apply(function, LLSD array).Nat Goodspeed
We define a specialization of LLSDParam<const char*> to support passing an LLSD object to a const char* function parameter. Needless to remark, passing object.asString().c_str() would be Bad: destroying the temporary std::string returned by asString() would immediately invalidate the pointer returned by its c_str(). But when you pass LLSDParam<const char*>(object) as the parameter, that specialization itself stores the std::string so the c_str() pointer remains valid as long as the LLSDParam object does. Then there's LLSDParam<LLSD>, used when we don't have the parameter type available to select the LLSDParam specialization. LLSDParam<LLSD> defines a templated conversion operator T() that constructs an LLSDParam<T> to provide the actual parameter value. So far, so good. The trouble was with the implementation of LLSDParam<LLSD>: it constructed a _temporary_ LLSDParam<T>, implicitly called its operator T() and immediately destroyed it. Destroying LLSDParam<const char*> destroyed its stored string, thus invalidating the c_str() pointer before the target function was entered. Instead, make LLSDParam<LLSD>::operator T() capture each LLSDParam<T> it constructs, extending its lifespan to the lifespan of the LLSDParam<LLSD> instance. For this, derive each LLSDParam specialization from LLSDParamBase, a trivial base class that simply establishes the virtual destructor. We can then capture any specialization as a pointer to LLSDParamBase. Also restore LazyEventAPI tests on Mac.
2023-10-27DRTVWR-587: Skip Visual Studio LLSDParam<const char*> tests for now.Nat Goodspeed
They do work fine on clang... unblocking the rest of the team during diagnosis.
2023-10-26SL-20536: Fix build error C1128. secondlife-bin object file too big. Compile ↵Cosmic Linden
with /bigobj
2023-10-25Removed dead code after merge breaking the buildBrad Linden
2023-10-25Fix DRTVWR-559 std::array usage in llrender and llprimitive after mergeBrad Linden
2023-10-25Merge remote-tracking branch 'origin/main' into DRTVWR-559Brad Linden
2023-10-26D587 Post merge fmod issues fixAndrey Kleshchev
2023-10-25Post merge build fixAndrey Kleshchev
generated by cgit v1.2.3 (git 2.25.1) at 2024-12-15 01:40:29 +0000