Commit Graph

23 Commits (master)

Author SHA1 Message Date
Ansariel 343aeeeb36 Merge remote-tracking branch 'LGPL/master'
# Conflicts:
#	doc/contributions.txt
#	indra/newview/skins/default/xui/de/panel_preferences_graphics1.xml
2024-05-16 02:11:51 +02:00
Andrey Lihatskiy 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
Cosmic Linden d0458c4853 secondlife/viewer#1006: Move blank material constant to indra_constants.h 2024-03-18 13:57:01 -07:00
Andrey Kleshchev 23aa975cf0 SL-20669 Fix white uuid 2024-02-05 16:44:07 +02:00
Andrey Kleshchev 869712e273 SL-20669 Move constants out of settings.xml
UIImgInvisibleUUID doesn't exist
Default normal for material is 'null'
2024-01-24 17:40:01 +02:00
Graham Linden 723f1891db Merge 6.3.1 viewer-release 2019-08-26 12:35:18 -07:00
Anchor d3323fb316 [SL-1360] - fix no alpha on default bake textures. uploaded new pngs 2019-02-20 03:16:05 +05:30
Rider Linden ed2e333a54 MAINT-9734: Change limits on settings values. 2018-09-24 17:00:01 -07:00
Anchor Linden 3bf89821d9 [DRTVWR-455] - added 5 new bake channels 2018-05-21 16:00:52 -07:00
Anchor Linden 83ab2dfe0f MAINT-8421: default textures for server bakes 2018-03-29 14:05:47 -07:00
Anchor Linden bfbcd6d169 [MAINT-8081] - bakes on mesh. 1st pass. changed texture panel to select bakes on objects. handle magic bake ids in LLViewerObject. 2018-02-28 22:14:38 -08:00
AndreyL ProductEngine c50f96b492 Merged in lindenlab/viewer-lynx 2016-05-20 02:06:08 +03:00
andreykproductengine d3de134da0 MAINT-6409 invisiprims should be preloaded 2016-05-18 17:17:32 +03:00
ruslantproductengine 503dc6ee65 MAINT-6317 [QuickGraphics-RC] Some rigged mesh attachments render fully on jellybaby avatars when ALM is enabled
FIXED
- remove global identifier for the black texture
- add black texture 2x2x3 localy on apllication startup
- add special flag to LLViewerFetchedTexture for protect from removing
2016-04-21 12:47:49 +03:00
Oz Linden ded162be60 fix merge error for specular rendering on impostors 2016-03-22 16:30:59 -04:00
Oz Linden 5822fb00b6 merge DRTVWR-398 build cleanup fixes 2016-03-07 12:41:11 -05:00
ruslantproductengine d4cb7f450d MAINT-5022 [QuickGraphics] Materials should not be applied to simple imposters
Fixe based on that texture with assetd id: "3b39cc01-c2d1-e194-1181-e4404978b20c"
will exist on data server.
2016-02-19 18:03:34 +02:00
Oz Linden c8726aba30 remove execute permission from many files that should not have it 2015-11-10 09:48:56 -05:00
Richard Linden 3b6004adf7 BUILDFIX: fixed tabs in cmake file and lack of newline at EOF 2013-10-03 15:14:26 -07:00
Richard Linden a2e22732f1 Summer cleaning - removed a lot of llcommon dependencies to speed up build times
consolidated most indra-specific constants in llcommon under indra_constants.h
fixed issues with operations on mixed unit types (implicit and explicit)
made LL_INFOS() style macros variadic in order to subsume other logging methods
such as ll_infos
added optional tag output to error recorders
2013-07-30 19:13:45 -07:00
Graham Madarasz bf6182daa8 Update Mac and Windows breakpad builds to latest 2013-03-29 07:50:08 -07:00
Oz Linden 06b0d72efa Change license from GPL to LGPL (version 2.1) 2010-08-13 07:24:57 -04:00
James Cook 8ff96a3515 Migrated LLUUIDs and some float constants out of headers into .cpp files
Moved some functions with llinfos into .cpp files
Linker optimizations, all
2009-11-28 20:08:09 -08:00