d19d44cc72
Merge pull request #3911 from secondlife/main
...
Merge 2025.03 release into develop.
2025-04-15 10:14:27 -04:00
6b88a2bec2
#3780 disable water exclusion if user applies PBR or Media
2025-03-24 18:05:06 +02:00
dee3257ffd
#1964 fix for reflection probe doesn't update position when the linkset is moved by the script
2025-03-20 15:15:42 +02:00
4132a13972
Merge branch 'marchcat/maint-b-cherrypicks' into marchcat/2025.03-maint-b
2025-03-11 05:10:11 +02:00
6fd4f13c47
Add support for RequestTaskInventory capability
...
The viewer now prefers to load inventory via the capability rather than
over the deprecated Xfer system, though both are still supported.
# Conflicts:
# indra/newview/llviewerobject.h
2025-03-11 04:21:01 +02:00
4214ab8e79
#3280 Fix crashes at gFloaterTools
...
Likely specific to headless client
2025-02-28 00:02:02 +02:00
99a9258d52
Issue #2687 : Honor flag sent by server indicating server side autopilot is engaged. When flag is set allow sever to update local avatar rotation.
2025-02-26 15:47:53 -08:00
486613e79b
Profile guided optimization pass ( #2582 )
...
- Tune up LLJointRiggingInfoTab
- Visualize joint bounding boxes when visualizing joints
- Use LLJointRiggingInfo to caclulate desired resolution of a texture
- Throttle calls to calcPixelArea
- Fetch MeshSkinInfo immediately when header is received
2024-09-16 18:49:03 -05:00
feecf09573
#2431 Fix for redundant searching for pixeismall.j2c causing frame stalls
2024-08-27 15:59:41 -05:00
1743fe92d6
secondlife/viewer#2391 : Remove avatar rigging "callstack" logging
2024-08-22 09:18:52 -07:00
ecfa05711e
#2231 BugSplat Crash #1502347 : SecondLifeViewer!LLViewerObject::getBoundingBoxAgent(5858)
2024-08-09 18:17:52 +02:00
c4ff0b4889
viewer#2071 Properly handle 'out of memory' for meshes
2024-07-29 21:20:38 +03:00
7d2cd036ea
Fix rare shutdown crash in LLViewerObjectList
2024-07-21 20:10:02 -04:00
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
b099dbef27
viewer#1131 Sync 'transform' arrows with UI
2024-07-04 08:29:37 +03:00
ab87978cbc
1836 dont store texture in system memory unless absolutely necessary ( #1843 )
...
* #1836 Texture memory usage overhaul. Much decrufting
- don't keep a copy of textures in system memory
- use GPU to downrez textures instead of reloading from cache
- use GPU to generate brightness/darkness bumpmaps
2024-06-27 13:12:43 -05:00
7c42711ca3
Merge remote-tracking branch 'origin/DRTVWR-600-maint-A' into project/gltf_development
2024-06-10 16:22:12 -07:00
b42f9d836b
Re-enable a lot of compiler warnings for MSVC and address the C4267 "possible loss of precision" warnings
2024-06-01 15:49:26 +02:00
9f6849e081
Merge remote-tracking branch 'origin/project/gltf_development' into brad/merge-maint-a-to-dev
2024-05-23 11:35:23 -07:00
a1f49564d6
Merge remote-tracking branch 'origin/DRTVWR-600-maint-A' into brad/merge-maint-a-to-dev
2024-05-23 11:31:19 -07:00
e2e37cced8
Fix line endlings
2024-05-22 22:40:26 +03:00
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
03c4458bdc
#1392 GLTF Upload ( #1394 )
...
* #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-20 13:22:55 -05:00
155ddf2336
Merge pull request #1421 from secondlife/DRTVWR-600-maint-A
...
Drtvwr 600 maint a
2024-05-07 09:47:37 -05:00
f9473e8afc
secondlife/viewer#1333 BOOL to bool conversion leftovers: ternaries
2024-05-07 10:18:51 +02:00
c6d752b880
Merge remote-tracking branch 'origin/DRTVWR-600-maint-A' into gltf-dev-maint-a-merge
2024-05-06 16:48:58 -05:00
a701cce8e0
#1357 Preserve asset "extras" and switch to std::shared_ptr for referencing Asset from LLViewerObject to cut down rebuild time
2024-05-01 09:51:32 -05:00
38c2a5bde9
Merge branch 'marchcat/w-whitespace' into marchcat/x-ws-merge
2024-05-01 08:16:58 +03:00
5e2bac01cb
#1357 GLTF Export Prototype
2024-04-30 17:26:48 -05:00
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
bc93177ea0
1176 integrate llgltfnode with selection manager and llmaniptranslate/rotate ( #1258 )
...
* #1176 Somewhat working GLTF Node support for translate tool
* #1176 Missing file from last commit
* #1176 Better translation for rotated nodes.
* #1176 Fix for objects snapping back to original position
* #1176 GLTF Samples compatibility pass -- attempt at improving rotation manip support, incidental cleanup, GLTF node debug display
* #1176 Clean out some unused and not working functions.
* #1176 Fix for mac build, incidental cleanup
* Mac build fix
2024-04-17 16:12:49 -05:00
eab5beb54c
Merge branch 'main' into marchcat/x-merge
...
# Conflicts:
# indra/llimage/llimageworker.cpp
# indra/llimage/llimageworker.h
# indra/newview/llcontrolavatar.cpp
# indra/newview/llfloaterprofiletexture.cpp
# indra/newview/lloutfitslist.cpp
# indra/newview/lloutfitslist.h
# indra/newview/lltexturefetch.cpp
2024-04-12 15:43:34 +03:00
d0102af56d
Merge branch 'main' of https://github.com/secondlife/viewer into DRTVWR-600-maint-A
...
# Conflicts:
# indra/llcommon/llapp.cpp
# indra/llcommon/llapp.h
# indra/llimage/llimageworker.cpp
# indra/llui/llcontainerview.cpp
# indra/llui/llcontainerview.h
# indra/llui/llkeywords.cpp
# indra/llui/lltabcontainer.cpp
# indra/llui/lltextbase.cpp
# indra/newview/llappviewer.cpp
# indra/newview/llfavoritesbar.cpp
# indra/newview/llfavoritesbar.h
# indra/newview/llfloaterimnearbychathandler.cpp
# indra/newview/llfloaterpreference.cpp
# indra/newview/llhudnametag.h
# indra/newview/llinventorypanel.cpp
# indra/newview/llinventorypanel.h
# indra/newview/llmeshrepository.cpp
# indra/newview/lloutfitgallery.cpp
# indra/newview/lloutfitslist.cpp
# indra/newview/llpaneleditwearable.cpp
# indra/newview/llpanelprofilepicks.cpp
# indra/newview/llpanelvoicedevicesettings.h
# indra/newview/llpreviewscript.cpp
# indra/newview/llpreviewscript.h
# indra/newview/llselectmgr.cpp
# indra/newview/lltranslate.cpp
# indra/newview/llviewerassetupload.cpp
# indra/newview/llviewermessage.cpp
2024-04-11 21:59:38 +02:00
5a47a3cb23
Merge remote-tracking branch 'origin/main' into release/materials_featurette
2024-04-09 14:17:34 -07:00
71ed19839e
Merge branch 'main' into DRTVWR-600-maint-A
...
# Conflicts:
# indra/newview/llappviewer.cpp
# indra/newview/llfloaterchangeitemthumbnail.cpp
# indra/newview/llpanelprofile.cpp
# indra/newview/llselectmgr.cpp
# indra/newview/lltexturectrl.cpp
# indra/newview/lltexturectrl.h
# indra/newview/lltooldraganddrop.cpp
# indra/newview/llviewerdisplay.cpp
# indra/newview/llvovolume.cpp
2024-03-27 00:45:06 +02:00
1ae6f5dd6f
Merge branch 'main' into DRTVWR-591-maint-X
...
# Conflicts:
# indra/llui/lltransutil.cpp
# indra/newview/app_settings/settings.xml
# indra/newview/llfloaterenvironmentadjust.cpp
# indra/newview/llpaneleditwater.cpp
# indra/newview/llpanelface.cpp
# indra/newview/lltexturectrl.cpp
# indra/newview/lltexturectrl.h
2024-03-27 00:33:40 +02:00
78174fc865
Merge remote-tracking branch 'origin/main' into DRTVWR-588-maint-W
...
# Conflicts:
# .github/workflows/build.yaml
2024-03-27 00:14:56 +02:00
60d3dd98a4
Convert remaining BOOL to bool
2024-02-21 23:14:31 +02:00
5e697cc04c
SL-20469 Crash at dead mRootVolp in getAttachedAvatar()
2024-02-21 05:23:36 +02:00
c3e6f7b164
Convert remaining cases of BOOL to bool in llmath and llprimitive
...
Changed the return values for LLPrimitive::packTEMessage methods from FALSE to true - these seemed to be strange and wrong, especially considering the following statement in LLVOAvatarSelf:
bool success = packTEMessage(mesgsys);
2024-02-20 02:14:01 +02:00
f1c97f4057
misc: BOOL to bool
2024-02-18 22:04:44 +02:00
4419bb8709
more misc: BOOL (int) to real bool
2024-02-12 23:17:22 +02:00
739ff27c06
#740 Make sure we evaluate if the probe is a mirror probe or not.
...
#682 Re-enable gaussian filtering, and reduce the mirror resolution back to 1024.
Also just generally clean up the code a bit.
2024-02-06 02:53:57 -08:00
a888531fd1
https://github.com/secondlife/viewer-issues/issues/23 Make the face selection for mirrors actually reflect what it does
2024-01-24 16:22:45 -08:00
373b06398c
Merge remote-tracking branch 'origin/release/materials_featurette' into DRTVWR-583
2024-01-24 14:37:33 -08:00
983a3c7207
SL-20780 Clean up some dead code.
2024-01-09 15:52:33 -06:00
82d8b2a720
sl-20635 attempts at build fixes, added a few stray log messages about log file changes
2024-01-05 19:01:40 +00:00
520f710cd6
Merge remote-tracking branch 'origin/main' into simon/sl-20635-new-data
2024-01-03 01:34:58 +00:00
c87850ddab
Merge branch 'main' into DRTVWR-591-maint-X
...
# Conflicts:
# doc/contributions.txt
# indra/newview/llpanelprofile.cpp
# indra/newview/llspatialpartition.cpp
2023-12-18 07:57:29 +02:00
4b98ae6e8a
Merge branch 'DRTVWR-587-maint-V' into DRTVWR-588-maint-W
...
# Conflicts:
# indra/newview/llspatialpartition.cpp
2023-12-14 02:47:44 +02:00
Jonathan "Geenz" Goodman