aa7c8eeaef
Merge branch 'DRTVWR-559' of https://github.com/secondlife/viewer
...
# Conflicts:
# indra/llcommon/llprofiler.h
# indra/llwindow/llwindowmacosx.cpp
# indra/newview/app_settings/settings.xml
# indra/newview/llinventorymodel.cpp
# indra/newview/llstartup.cpp
# indra/newview/lltexturectrl.cpp
# indra/newview/lltexturectrl.h
2023-11-07 11:56:19 +01:00
cc089d88ad
SL-20523 Ensure override gets updated before render material
2023-11-06 18:29:42 +02:00
0d8893822d
SL-20523 Local textures not updating on PBR Materials #5
2023-11-06 18:29:42 +02:00
52c60ab3fd
SL-20523 Local textures not updating on PBR Materials #4
2023-11-06 18:29:42 +02:00
3a5b678eba
SL-20523 Local textures not updating on PBR Materials #3
2023-11-06 18:29:42 +02:00
596a63051e
SL-20523 Local textures not updating on PBR Materials #2
2023-11-06 18:29:42 +02:00
dc63dfc0dd
SL-20523 Local textures not updating on PBR Materials #1
...
Update editor in which texture changed to local
2023-11-06 18:29:42 +02:00
0833bbb44c
Merge branch 'DRTVWR-559' of https://bitbucket.org/lindenlab/viewer
2022-08-31 09:07:36 +02:00
d19d827121
Merge branch master (DRTVWR-483) into DRTVWR-559
...
# Conflicts:
# indra/newview/lllocalbitmaps.cpp
# indra/newview/lllocalbitmaps.h
# indra/newview/llviewerregion.cpp
# lllocalgltfmaterials.* were modified to match lllocalbitmaps*
2022-08-31 00:30:49 +03:00
fbccc0986d
SL-17653 Clean up unneeded filepicker dependency.
2022-08-31 00:18:51 +03:00
b0f88bef63
Merge branch 'DRTVWR-559' of https://bitbucket.org/lindenlab/viewer
2022-08-30 11:25:02 +02:00
8a91c13947
SL-17653 Local gltf materials #3
2022-08-23 00:23:16 +03:00
0d217dc73c
SL-17653 Local gltf materials #2
2022-08-23 00:23:05 +03:00
8f6d149fad
SL-16937 New Profile capability, image uploader for testing
...
This commit is mostly to simplify cap testing for server side. Plan is to remove LLLocalBitmap and draw texture more directly instead
2022-03-30 18:35:47 +03:00
0b6b4c7097
Merge Firestorm LGPL
2019-11-15 19:05:26 +01:00
e9c0a93f99
Fix merge-related compile errors
2019-11-14 15:19:55 -07:00
dc1453af9c
Merge in from viewer-release 6.3.5
2019-11-13 16:46:27 -07:00
d79b79fbe2
Merge viewer-ordered-shutdown
2019-10-19 03:16:10 +02:00
e439f0366f
Merge from lindenlab/viewer-release
2019-08-29 15:43:02 +03:00
de837a5800
Merge Firestorm LGPL
2019-08-27 19:04:14 +02:00
723f1891db
Merge 6.3.1 viewer-release
2019-08-26 12:35:18 -07:00
a2d91f3160
DRTVWR-493 LLLocalBitmapMgr to Singleton
2019-06-20 20:53:46 +03:00
83b514a46f
Merge viewer-eep
2018-10-24 22:57:18 +02:00
6bb496625f
SL-9746 [EEP] Local Texture options should work with EEP
2018-10-08 20:27:10 +03:00
7392f82e71
Merge Firestorm LGPL
2018-06-21 20:56:19 +02:00
4aa45cb8e1
Merge viewer-baking-updates
2018-06-16 13:22:49 +02:00
7abb0c99be
[DRTVWR-476] - add universal head,upper,lower tattoos
2018-06-13 01:09:27 +05:30
56fc3222dc
[DRTVWR-476] - create new wearable type
2018-06-08 20:36:49 +05:30
fbea5dbc90
Replace remaining GenericXXXFilePicker with the default LL implementation
2018-06-07 22:15:37 +02:00
31b62685f2
Merge viewer-baking-updates
2018-05-22 17:23:58 +02:00
0fdbe7e34d
Merge
2018-05-21 16:47:42 -07:00
3bf89821d9
[DRTVWR-455] - added 5 new bake channels
2018-05-21 16:00:52 -07:00
6219aec54f
Merge viewer-neko
2018-03-02 10:52:44 +01:00
d9064d3a4e
MAINT-8317 Fixed Local Textures for Advanced Lighting Projectors do not keep the selected texture.
2018-02-27 15:49:15 +02:00
e8a008684e
Add convenience methods for generic threaded filepickers
2016-12-04 21:00:32 +01:00
61193e6b36
FIRE-12217: Add threaded filepicker for local textures picker
2016-12-03 17:44:36 +01:00
e18d32ee13
Merge viewer-bear
2016-09-12 20:58:57 +02:00
d6b0db5118
MAINT-6665 [Contribution] Viewer crashes when setting a local texture from a path containing non-standard characters
2016-08-26 17:02:32 +03:00
d05708f4b3
FIRE-19855; use wide character path name for windows.
2016-08-17 22:45:57 +02:00
a0188a5358
Merge Firestorm LGPL
2016-05-09 12:41:24 +02:00
950c41d184
merge 4.0.4-release and MAINT-5974
2016-05-06 10:28:42 -04:00
df4205dc46
Merge viewer-bear
2016-04-02 03:52:29 +02:00
0e155c51a9
MAINT-6257 Textures loading issues.
2016-03-29 18:52:54 +03:00
d171e16c58
Merge Firestorm LGPL
2016-03-18 10:16:25 +01:00
31f3db0291
merge changes for DRTVWR-417
2016-03-16 13:08:06 -04:00
3192fe832f
Merge viewer-quickgraphics
2016-03-08 01:41:31 +01:00
30f9287645
MAINT-2199 reverted previous change, refixed missing cloud and ban line
2016-03-03 00:15:33 +02:00
b3e7fff9ae
MAINT-2199 restored original UI mechanics, removed icons from UI list
2016-02-27 16:06:54 +02:00
0a741843ca
Merge viewer-bear
2016-02-21 02:35:15 +01:00
10e2bd56c1
MAINT-2199 In some rare cases priorities can change, it shouldn't affect texture list.
2016-02-18 17:35:43 +02:00
Ansariel