0ecfbc3de9
Merge remote-tracking branch 'LGPL/master'
...
# Conflicts:
# autobuild.xml
# indra/cmake/CMakeLists.txt
# indra/cmake/GoogleMock.cmake
# indra/llappearance/llwearable.cpp
# indra/llcharacter/llmultigesture.cpp
# indra/llcharacter/llmultigesture.h
# indra/llimage/llimage.cpp
# indra/llimage/llimagepng.cpp
# indra/llimage/llimageworker.cpp
# indra/llmessage/tests/llmockhttpclient.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.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/llgroupactions.cpp
# indra/newview/llimpanel.cpp
# 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/llpaneleditwearable.cpp
# indra/newview/llpanelobjectinventory.cpp
# indra/newview/llpanelprofile.cpp
# 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/llviewermenu.cpp
# indra/newview/llviewerparceloverlay.cpp
# indra/newview/llviewertexlayer.cpp
# indra/newview/llviewertexturelist.cpp
# indra/newview/macmain.h
2024-05-16 14:10:55 +02:00
5f1a19af72
Merge remote-tracking branch 'LL/marchcat/x-ws-merge'
...
# Conflicts:
# autobuild.xml
# indra/linux_crash_logger/llcrashloggerlinux.cpp
# indra/newview/llappviewerlinux_api.h
# indra/newview/llappviewerlinux_api_dbus.cpp
# indra/newview/llappviewerlinux_api_dbus.h
# indra/newview/llavatarpropertiesprocessor.h
# indra/newview/llcallbacklist.cpp
# indra/newview/llimpanel.h
2024-05-01 12:30:57 +02: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
163ea9a5b7
Merge branch 'DRTVWR-600-maint-A' of https://github.com/secondlife/viewer
...
# Conflicts:
# indra/llmath/llvolume.cpp
# indra/llmath/llvolume.h
# indra/llmath/xform.h
# indra/llprimitive/llmaterialtable.cpp
# indra/llprimitive/llprimitive.h
# indra/llrender/llfontfreetype.cpp
# indra/llrender/llgltexture.cpp
# indra/llrender/llgltexture.h
# indra/llrender/llimagegl.cpp
# indra/llrender/llimagegl.h
2024-02-20 10:49:47 +01: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
dc42a2b8c7
Merge branch 'DRTVWR-559' of https://github.com/secondlife/viewer
...
# Conflicts:
# indra/newview/app_settings/settings.xml
# indra/newview/llpanelface.cpp
# indra/newview/skins/default/xui/en/panel_tools_texture.xml
2023-08-14 21:21:19 +02:00
e7e565dc6e
SL-20024: Put material in object inventory when material is no-modify or no-transfer
2023-08-11 16:30:49 -07:00
289fb458f3
Merge branch 'master' of https://vcs.firestormviewer.org/phoenix-firestorm
...
# Conflicts:
# doc/contributions.txt
# indra/llprimitive/llmaterial.h
# indra/newview/VIEWER_VERSION.txt
# indra/newview/lldrawpool.cpp
# indra/newview/lldrawpoolalpha.cpp
# indra/newview/llfilepicker.cpp
# indra/newview/llfilepicker.h
# indra/newview/llpanelface.cpp
# indra/newview/llviewermenufile.cpp
# indra/newview/llvovolume.cpp
2023-07-18 10:59:02 +02:00
f975cfd736
Merge remote-tracking branch 'origin/main' into DRTVWR-559
2023-07-17 13:37:03 -07:00
2c51fe5aad
Merge branch 'DRTVWR-580-maint-T' of https://github.com/secondlife/viewer
...
# Conflicts:
# indra/newview/app_settings/settings.xml
# indra/newview/llfilepicker.cpp
# indra/newview/llpanelface.cpp
# indra/newview/llpanelface.h
# indra/newview/llpanelwearing.cpp
# indra/newview/llvovolume.cpp
2023-03-22 17:35:43 +01:00
a6ea3fa741
SL-18882: Show diffuse non-alpha textures opaque on editing
2023-02-27 08:15:29 +01:00
b4fde14f09
Merge branch 'DRTVWR-559' of https://github.com/secondlife/viewer
...
# Conflicts:
# indra/llrender/llimagegl.cpp
# indra/llrender/llrender.cpp
# indra/llrender/llvertexbuffer.cpp
# indra/llrender/llvertexbuffer.h
# indra/newview/app_settings/settings.xml
# indra/newview/llappviewer.cpp
# indra/newview/lldrawpool.cpp
# indra/newview/lldrawpoolalpha.cpp
# indra/newview/lldrawpoolavatar.cpp
# indra/newview/lldrawpoolbump.cpp
# indra/newview/lldrawpooltree.cpp
# indra/newview/llface.cpp
# indra/newview/llmodelpreview.cpp
# indra/newview/llspatialpartition.h
# indra/newview/llviewerdisplay.cpp
# indra/newview/llviewertexturelist.cpp
# indra/newview/llviewerwindow.cpp
# indra/newview/llvovolume.cpp
# indra/newview/pipeline.cpp
2023-01-19 23:04:50 +01:00
7bd9d21e19
Optimizations, decruft, and intel compatibility pass ( #53 )
...
SL-18869, SL-18772 Overhaul VBO management, restore occlusion culling, intel compatibility pass, etc
2023-01-19 09:13:45 -06:00
b48f34b24c
Merge branch 'master' of https://vcs.firestormviewer.org/phoenix-firestorm
2022-11-01 14:04:55 +01:00
d066e8daf8
[FIRE-32269] rigged hair (esp. animesh) + batching fixes refactored
...
simplify logic
ignore empty material blocks where the alpha mode is blend
These should be treated the same as other alpha blend in order to batch properly
Fix for TE alpha breaking batches where material is set to alpha_mask
Two common occurences of this exist:
transparency huds that frequently are an afterthought
segmented bodies using alpha slicing.
2022-10-31 20:37:51 +00:00
c9ef206e39
Beginning viewer side work for SL-17198 new asset and inventory types for Materials
2022-04-28 13:08:37 -07:00
c9fbd9e2e8
SL-17116 work on implementing MaterialID in ExtraParams of ObjectUpdate and related messages
2022-04-27 14:48:25 -07:00
7199ce4514
SL-15299 SL-15313 BUG-230802 Revert BOM fix causing issues with avatar alpha masks.
...
Revert "SL-12069 Issues with bakes-on-mesh and alpha modes"
This reverts commit 5691d302ef
2021-05-26 10:57:39 -06:00
5691d302ef
SL-12069 Issues with bakes-on-mesh and alpha modes
2020-12-10 23:17:07 +02:00
3008962f0c
Convert tabs to spaces in llprimitive/llmaterial.* for sanity
2018-06-29 21:21:46 +01:00
82a097b06f
MAINT-8676 modify XUI to allow negative offsets again and fix up material handling of normal/specular offsets
2018-06-29 00:47:13 +01:00
7e4e59470f
NORSPEC-233 WIP for individual material param edits across hetero object selections
2013-06-07 08:58:15 -07:00
18e3985120
NORSPEC-162 Fix for objects with materials set ignoring "tranparency %" value.
2013-05-06 15:44:44 -05:00
4afb70eba7
Merge with latest viewer-dev-materials.
2013-04-17 17:47:18 -04:00
67af268b78
NORSPEC-90 Alpha pool hookups for materials.
2013-04-17 01:51:39 -05:00
0b4d76ce78
NORSPEC-123 et al...roll back NSPEC 91 fix to avoid knock-on and set correct default env intensity
2013-04-16 08:27:30 -07:00
fafa21315f
Fix issue with alphaNonIndexedNoColorF shader and static init fail on default spec color (real source of NORSPEC-94, I think)
2013-04-12 15:21:35 -07:00
9e3155c368
NORSPEC-82 NORSPEC-85 More UI shenanigans
2013-04-08 11:40:10 -07:00
f189ba4a3d
NORSPEC-71 Lots more UI hookups
...
Written with and Reviewed By Graham
2013-04-03 16:56:59 -05:00
6300f4f768
NORSPEC-61 Hook up material parameters to shaders.
2013-03-27 21:59:14 -05:00
fbf8e51c60
Added LLMaterialMgr::remove() to remove material information from a face
2013-02-25 00:16:14 +01:00
5f03e197f4
Trying to set materials up for rendering! Yay!
2013-01-25 17:54:38 -05:00
25bffc3d43
Added LLMaterialMgr::get() to retrieve individual materials (with optional callback)
2012-12-03 15:20:11 +01:00
1e26dbdcd2
Started LLMaterialMgr to handle viewer<->region materials communication
...
* refactored LLFloaterDebugMaterials::requestPutMaterials() to use LLMaterialMgr instead
* replaced "Object editing" results list with information about the active selection instead
2012-12-03 01:46:26 +01:00
6618cff96c
Encapsulate material definitions in LLMaterial and refactor LLFloaterDebugMaterials to use the new class
2012-11-29 00:00:18 +01:00
Ansariel