summaryrefslogtreecommitdiff
path: root/indra/newview
AgeCommit message (Collapse)Author
2024-05-23viewer-private#238 Complexity mode should persistAndrey Kleshchev
2024-05-23triage#59 Cover cases where some attachments stayed visibleAndrey Kleshchev
2024-05-22Fix line endlingsAnsariel
2024-05-22Fix line endingsAndrey Lihatskiy
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-21viewer#1520 Material upload floater displays wrong upload feeAndrey Kleshchev
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-19More session shutdown cleanupRoxie Linden
2024-05-17Clean up some shutdown code.Roxie Linden
2024-05-17viewer#1501 Crash initiating screenSpaceReflUtil.glslAndrey Kleshchev
Error: Function return is not matching type
2024-05-17viewer#1117 Use attachment info to prevent accidental nudity #2Andrey Kleshchev
Discard null id attachments
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-15Merge commit '29be88d60d654193926add496d2d851f7c217356' into ↵Brad Linden
project/gltf_development
2024-05-15secondlife/viewer#1474: Remove small texture offset from PBR terrainCosmic Linden
2024-05-15secondlife/viewer#1474: Fix broken shader compilationCosmic Linden
2024-05-16Merge branch 'release/materials_featurette' into marchcat/x-mf-mergeAndrey Lihatskiy
2024-05-15#1267 Fix for alpha cutoff of zero and base color factor alpha of zero ↵Dave Parks
making objects disappear (#1485)
2024-05-15jira-archive-internal#67837 Windows' bulk export of snapshots and texturesAndrey Kleshchev
Properly sanitize names Better duplicate avoidance
2024-05-15#1466 Loosen clamp on haze glow to fix skies that want to be bonkers (#1470)Dave Parks
2024-05-15secondlife/viewer#1418 Mesh Upload - Physics - Bounding Box is not working ↵Alexander Gavriliuk
as expected
2024-05-15secondlife/viewer#1474: Remove small texture offset from PBR terrainCosmic Linden
2024-05-15Merge branch 'release/maint-x' into marchcat/x-mf-mergeAndrey Lihatskiy
2024-05-15Merge branch 'main' into marchcat/x-mf-mergeAndrey Lihatskiy
# Conflicts: # doc/contributions.txt # indra/newview/llfloaterimagepreview.cpp
2024-05-15Post-merge spaces fixAndrey Lihatskiy
2024-05-15Merge branch 'marchcat/w-whitespace' into marchcat/x-mf-mergeAndrey Lihatskiy
2024-05-15triage#49 Menu didn't work for already selected itemsAndrey Kleshchev
2024-05-14Increment viewer version to 7.1.8Nat Goodspeed
following promotion of secondlife/viewer #705: Maintenance X
2024-05-14Fix shader error on mac: 'Redeclaration of sized array 'terrain_texcoord' ↵Brad Linden
not allowed'
2024-05-14Merge branch 'brad/gltf-dev-merge-main-and-featurettes' into ↵Brad Linden
project/gltf_development
2024-05-14Merge branch 'project/gltf_development' into project/gltf_developmentDave Parks
2024-05-14Merge remote-tracking branch 'origin/release/materials_featurette' into ↵Brad Linden
project/gltf_development
2024-05-13Don't overwrite voice channel's credentials when retrieving the channel.Roxie Linden
2024-05-13incoming p2p sessions for webrtc may not have names yet.Roxie Linden
2024-05-13Revert "viewer#819 Avoid reading the same XML file multiple times"Andrey Kleshchev
This reverts commit a865d423974ea06dffa47798c81e98e7570b02ec. Reason for revert: viewer#1420, reverting to not hold maint-A (is deepCopy not full?)
2024-05-13viewer-private#236 Don't block removal of marketplace foldersAndrey Kleshchev
Marketplace is not visible outside of own floater and that floater will do an extra warning when deleting listings that have additional data.
2024-05-10secondlife/viewer#907: Local PBR terrain texture transformsCosmic Linden
2024-05-10Fix issue where groups/adhoc chats were named with the initiators display nameRoxie Linden
2024-05-10Fix broken merge and BOOL/bool issuesAnsariel
2024-05-08Fix some session shutdown/error handling codeRoxie Linden
2024-05-08Fix for mirrors not functioning properly under water. (#1436)Jonathan "Geenz" Goodman
* #1165 Fix for clipping and culling for mirrors under water.
2024-05-08Even more mirror fixes. (#1429)Jonathan "Geenz" Goodman
#1271 Add support for mirrors that do not have avatars in them. It does this based on if the probe is set to dynamic or not. #1370 More optimization work to reduce GPU utilization. #1058 - Removed sim feature flag that was overriding mirrors enabled flags secondlife/viewer-private#128 - Locally cache the mirror probe #679 Add additional options to the build floater for mirror probes, including descriptions.
2024-05-07Merge pull request #1421 from secondlife/DRTVWR-600-maint-ADave Parks
Drtvwr 600 maint a
generated by cgit v1.2.3 (git 2.25.1) at 2024-10-22 11:23:36 +0000