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
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
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
e7e565dc6e
SL-20024: Put material in object inventory when material is no-modify or no-transfer
2023-08-11 16:30:49 -07:00
f975cfd736
Merge remote-tracking branch 'origin/main' into DRTVWR-559
2023-07-17 13:37:03 -07:00
e23b3972a0
DRTVWR-559 Fix for bad hashing of materials breaking render batches and who knows what else.
2023-03-22 18:25:47 -05:00
a6ea3fa741
SL-18882: Show diffuse non-alpha textures opaque on editing
2023-02-27 08:15:29 +01:00
93b1da52f5
SL-18908 Make media texture override base color and emissive texture on PBR materials when present.
2023-02-02 14:35:09 -06: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
c9ef206e39
Beginning viewer side work for SL-17198 new asset and inventory types for Materials
2022-04-28 13:08:37 -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
60d256e80f
MAINT-8915
...
Fix sync of material rotation and offset values when using aligned planar faces.
Make it possible to set a specific TE's normal/spec offset/rotation values.
Eliminate redundant conversions in LLSD -> struct handler.
2018-07-30 22:38:30 +01:00
ba31900ea8
MAINT-8891 viewer-side fix for redundant setting of specular offset in LLSD to struct translation
2018-07-20 19:17:59 +01: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
23711c9275
Rename llround(..) to ll_round(..) because of a collision with MS llround (long long round) in VS2013
2014-12-10 08:44:08 -08:00
e340009fc5
second phase summer cleaning
...
replace llinfos, lldebugs, etc with new LL_INFOS(), LL_DEBUGS(), etc.
2013-08-09 17:11:19 -07:00
eba7eb2d06
NORSPEC-233 fix default value and material apply logic errors
2013-06-08 06:28:48 -07:00
18e3985120
NORSPEC-162 Fix for objects with materials set ignoring "tranparency %" value.
2013-05-06 15:44:44 -05: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
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
ca790f7320
Bypass GCC template stumble by specializing getMaterialField for LLUUID
2012-12-18 21:52:41 +01:00
a17f3e41ff
Use a single multiplier value for all material fields
2012-12-07 17:04:21 +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
2feac96090
Fixed two minor issues (mDiffuseAlphaMode and mAlphaMaskCutoff were reversed; specular rotation had wrong format specifier)
2012-12-02 01:04:56 +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