summaryrefslogtreecommitdiff
path: root/indra
AgeCommit message (Collapse)Author
2024-05-22Merge branch 'DRTVWR-600-maint-A' of https://github.com/secondlife/viewer ↵Ansariel
into DRTVWR-600-maint-A # Conflicts: # indra/llcommon/llpredicate.h # indra/newview/lldrawpoolavatar.cpp # indra/newview/llinventorybridge.cpp
2024-05-22Merge remote-tracking branch 'origin/main' into DRTVWR-600-maint-AAnsariel
# 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-22Merge remote-tracking branch 'DRTVWR-600-maint-A' into nat/kwdsNat Goodspeed
2024-05-22Bring over .xz compression from main, instead of .bz2.Nat Goodspeed
The main branch, and the current rev of viewer-build-util, consistently uses .xz for tarballs.
2024-05-22triage#59 Fix missed 'static' declarationsAndrey Kleshchev
2024-05-22Tabs to spaces.Nicky
2024-05-22Move Linux specific VolumeCatcherImport into the linux specific files.Nicky
2024-05-22Remove obsolete member mSystemIsVistaOrHigherNicky
2024-05-22New icon: 1024x1024fowlerdm
Added 1024x1024 version of new icon
2024-05-22New iconsfowlerdm
Even newer icons! Thalassocracy themed!
2024-05-21Change 'LLPredicate::Rule::requires()' to 'mandates()' for C++20.Nat Goodspeed
Although 'requires' appears in many comments and some string literals, and 'concept' in a few of each, LLPredicate::Rule appears to be the only use of any new C++20 reserved word in the existing code base. And it seems to be unreferenced.
2024-05-21viewer#1520 Material upload floater displays wrong upload feeAndrey Kleshchev
2024-05-20Blufault colors.xml: revert HTMLLinkColorfowlerdm
Set HTMLLinkColor back to "EmphasisColor"
2024-05-20Merge branch 'spaces-merge' into roxie/webrtc-voiceRoxie Linden
2024-05-20#1392 GLTF Upload (#1394)Dave Parks
* #1392 WIP -- Functional texture upload, stubbed out .bin upload. * #1392 GLTF Upload WIP -- Emulates successful upload Successfully uploads texture Emulates successful .gltf and .bin upload by injecting into local asset cache. Emulates rez from inventory by setting sculpt ID of selected object Currently fails in tinygltf parsing due to missing .bin * Add missing notification * Build fix * #1392 Add boost::json .gltf reading support. * #1392 boost::json GLTF writing prototype * Create gltf/README.md * Update README.md * Update README.md * Update README.md * Update README.md * Update README.md * #1392 Add ability to render directly from LL::GLTF::Material * Fix for mac build * Mac build fix * #1392 AssetType and Inventory Type plumbing * #1392 More sane error handling and scheduling of uploads. * #1392 Actually attempt to upload glbin * Mac build fix, upload nudge * Mac build fix * Fix glTF asset uploads to server * Mac build fix (inline not static) * More consistent inline * Add glm, mac nudge. * #1392 For consistency with spec, start using glm over glh:: and LLFoo * Another attempt at placating Mac builds * Another Mac nudge * Mac build take 23 * #1392 Prune LLMatrix4a from GLTF namespace. * #1392 Fix for orientation being off (glm::quat is wxyz, not xyzw) * #1392 WIP -- Actually send the sculpt type and id, nudge readme and alpha rendering * #1392 Working download! * #1394 Add support for GLTFEnabled SimulatorFeature * #1392 Review feedback --------- Co-authored-by: Pepper Linden <3782201+rohvani@users.noreply.github.com>
2024-05-20Merge remote-tracking branch 'origin/DRTVWR-600-maint-A' into ↵Brad Linden
brad/merge-maint-a-to-dev
2024-05-20triage#59 Render Friends Only optionAndrey Kleshchev
An option for performance testing, video recording or taking photos, so that unexpected people won't appear in your photos or tests.
2024-05-20Blufault colors.xmlfowlerdm
Misc adjustments
2024-05-19Get rid of a deprecated warning in Linux buildsRoxie Linden
2024-05-19More session shutdown cleanupRoxie Linden
2024-05-18Making FrogGreen bluefowlerdm
I saw green in emoji picker and it made me cry
2024-05-18Blufault: Camera & movement controlsfowlerdm
Hue adjustment
2024-05-18Add Fedora build creditErik Kundiman
2024-05-18Adjust MenuBarBGColorfowlerdm
Forgot about this one, silly me!
2024-05-18Less strictness with Fedora's GCC 14Erik Kundiman
2024-05-18Turn off C++ 20 compatibilityErik Kundiman
Compiling would fail otherwise at least on Fedora 40 and Ubuntu 24.04 with their GCC 13 or newer.
2024-05-18Colour bits test not done on Linux eitherErik Kundiman
Cause last time I checked, it didn't pass on Fedora.
2024-05-18Squircle icons, so far for macOS, by fowlerdmErik Kundiman
2024-05-18More people in creditsErik Kundiman
2024-05-18blufault: misc tweaksfowlerdm
hue-shifting a few more things
2024-05-18Adjust FriendColors & FilterTextfowlerdm
Found some things that could be a little more blue!
2024-05-17colors.xml & texures.xml fixfowlerdm
oopsie whoopsy!
2024-05-17Blufault: more blue - supporting xmlfowlerdm
making emphasiscolor a bit less green
2024-05-17Blufault skin: More bluefowlerdm
Slight hue adjustment
2024-05-17Clean up some shutdown code.Roxie Linden
2024-05-17fix bad indentation and modernise (#1503)Beq Janus
2024-05-17Bluefault: supporting xmlfowlerdm
XML tweaks to help blufault shine!
2024-05-17viewer#1501 Crash initiating screenSpaceReflUtil.glslAndrey Kleshchev
Error: Function return is not matching type
2024-05-17Don't try to report a stack trace on stack overflow (sigh)Nat Goodspeed
2024-05-17viewer#1117 Use attachment info to prevent accidental nudity #2Andrey Kleshchev
Discard null id attachments
2024-05-17New skin: Blufaultfowlerdm
Blue-ish modification of the default SL viewer skin
2024-05-17More misleading indentation fixesErik Kundiman
2024-05-17Parts that were left out during 7.1.7 mergeErik Kundiman
Including a very important one which is so assets are fetched!
2024-05-17Merge remote-tracking branch 'fowlerdm/main'Erik Kundiman
2024-05-16WebRTC clients calling Vivox clients should handle P2PRoxie Linden
2024-05-16Race condition resulted in close causing removal of peer connection while ↵Roxie Linden
other jobs might be using it.
2024-05-16Linux clang++ doesn't like implicit conversion of extreme ints.Nat Goodspeed
Try specifying the literal constants in the type we're comparing to.
2024-05-16Need magic #define for <boost/stacktrace.hpp> on Mac.Nat Goodspeed
2024-05-16On Windows, defend test.cpp against structured exceptions too.Nat Goodspeed
Since August 2023, we've seen occasional GitHub Windows build test runs terminate with 0xC00000FD: stack overflow. We've usually responded by bumping up the default coroutine stack size. On closer examination, it's always llleap_test.cpp that blows up that way -- and llleap_test.cpp doesn't appear to use coroutines at all. So apparently we've been consuming more address space for ALL viewer coroutines without actually addressing the problem. Reset the default coroutine stack size to where it was before we started bumping it up in response to these llleap_test.cpp stack overflow failures. Note that LLCoros already catches and reports Windows structured exceptions, underscoring that the observed stack overflow is not from within a coroutine. While at it, restore the Windows llleap_test.cpp data volume to match Posix. We think the problem that led to reducing that data volume was an APR bug, which we hope has been fixed. Equip test.cpp, the test driver program for all our TUT unit and integration tests, with a Windows structured exception handler. Try to treat a Windows structured exception as a test failure -- instead of silently terminating with 0xC00000FD. Moreover, when a structured exception occurs, output a stack trace so we can try to track it down.
2024-05-16Fix previous shader float conversionErik Kundiman
The i variable is still used as an integer on the next line.
generated by cgit v1.2.3 (git 2.25.1) at 2025-03-19 00:27:39 +0000