Andrey Kleshchev
|
014d7616b6
|
Merge branch master (DRTVWR-561) into DRTVWR-483
|
2022-08-04 00:15:15 +03:00 |
|
Mnikolenko Productengine
|
bbdbd6c2dd
|
SL-17204 FIXED The texture with full permissions is settled on the prim after copying texture from the object with texture with no transfer permission
|
2022-04-15 22:14:38 +03:00 |
|
Andrey Lihatskiy
|
0c5a621e29
|
Merge branch 'master' into DRTVWR-486
|
2021-04-01 20:49:55 +03:00 |
|
Andrey Lihatskiy
|
0bf68ce736
|
Merge branch 'master' into DRTVWR-483
|
2021-04-01 20:49:45 +03:00 |
|
Andrey Lihatskiy
|
a9f70ec80e
|
Merge branch 'master' into DRTVWR-483
# Conflicts:
# indra/newview/lltexturectrl.h
|
2020-09-28 22:21:50 +03:00 |
|
Andrey Kleshchev
|
4c69f9ebb1
|
Merged master(DRTVWR-497) into DRTVWR-486
|
2020-09-28 21:21:29 +03:00 |
|
Andrey Kleshchev
|
42fa322e76
|
Merged master (DRTVWR-497) into DRTVWR-514-keymappings
|
2020-09-28 21:21:13 +03:00 |
|
Andrey Lihatskiy
|
966f1ac84e
|
Merge branch 'master' into DRTVWR-486
|
2020-09-23 01:48:27 +03:00 |
|
Andrey Lihatskiy
|
f4bfaeb45e
|
Merge branch 'master' into DRTVWR-483
|
2020-09-23 01:48:13 +03:00 |
|
Dave Houlton
|
86e7cc3d35
|
Merge branch 'master' v6.4.9 into DRTVWR-497
|
2020-09-22 15:28:13 -06:00 |
|
Andrey Kleshchev
|
c2b55c4362
|
Merged master(DRTVWR-503) into DRTVWR-514-keymappings
|
2020-09-22 22:54:36 +03:00 |
|
Andrey Kleshchev
|
f3216ca1cd
|
SL-12688 Warnings part #2
|
2020-06-24 19:00:48 +03:00 |
|
andreykproductengine
|
0d78aa31e2
|
SL-6109 Removed LLDrawFrustum and used changes from EEP to prevent merge conflicts
|
2020-06-23 14:50:59 +03:00 |
|
andreykproductengine
|
2022c91e2d
|
Backed out changeset: 19f3fa6e3e63
|
2020-06-23 14:50:59 +03:00 |
|
andreykproductengine
|
0147a8c989
|
SL-6109 Implemented LLDrawFrustum
|
2020-06-23 14:49:39 +03:00 |
|
Andrey Kleshchev
|
1310fac3b1
|
SL-13359 #5 Implemented revised changes
|
2020-06-17 23:39:42 +03:00 |
|
Andrey Lihatskiy
|
efc3715713
|
Buildfix
|
2020-05-05 01:31:22 +03:00 |
|
Andrey Lihatskiy
|
ec9b989863
|
Merge branch 'DRTVWR-501-maint' into DRTVWR-503-maint
# Conflicts:
# indra/newview/llinventorybridge.cpp
# indra/newview/llinventorypanel.cpp
# indra/newview/lltexturectrl.cpp
# indra/newview/skins/default/xui/de/floater_texture_ctrl.xml
# indra/newview/skins/default/xui/es/floater_texture_ctrl.xml
# indra/newview/skins/default/xui/fr/floater_texture_ctrl.xml
# indra/newview/skins/default/xui/it/floater_texture_ctrl.xml
# indra/newview/skins/default/xui/ja/floater_texture_ctrl.xml
# indra/newview/skins/default/xui/pt/floater_texture_ctrl.xml
# indra/newview/skins/default/xui/ru/floater_texture_ctrl.xml
# indra/newview/skins/default/xui/tr/floater_texture_ctrl.xml
# indra/newview/skins/default/xui/zh/floater_texture_ctrl.xml
|
2020-05-05 00:37:16 +03:00 |
|
Andrey Lihatskiy
|
4cf4243573
|
Merge branch 'master' into DRTVWR-483
# Conflicts:
# indra/newview/CMakeLists.txt
# indra/newview/llviewerfloaterreg.cpp
# indra/newview/skins/default/xui/de/floater_preview_texture.xml
# indra/newview/skins/default/xui/es/floater_preview_texture.xml
# indra/newview/skins/default/xui/fr/floater_preview_texture.xml
# indra/newview/skins/default/xui/it/floater_preview_texture.xml
# indra/newview/skins/default/xui/ja/panel_edit_classified.xml
# indra/newview/skins/default/xui/ja/panel_me.xml
# indra/newview/skins/default/xui/ru/floater_preview_texture.xml
# indra/newview/skins/default/xui/tr/floater_picks.xml
# indra/newview/skins/default/xui/tr/floater_preview_texture.xml
# indra/newview/skins/default/xui/tr/panel_edit_classified.xml
# indra/newview/skins/default/xui/tr/panel_me.xml
# indra/newview/skins/default/xui/zh/floater_preview_texture.xml
|
2020-04-21 15:37:25 +03:00 |
|
Andrey Lihatskiy
|
7a311fe30e
|
Merge branch 'master' into DRTVWR-497
|
2020-04-20 21:21:12 +03:00 |
|
Andrey Kleshchev
|
cfb2b95c8c
|
SL-12641 Remade 'Pick: Texture' floater to eliminate translation overlaps
|
2020-02-18 18:33:28 +02:00 |
|
AndreyL ProductEngine
|
56056aa198
|
Upstream merge from viewer-neko
|
2019-11-27 23:20:03 +02:00 |
|
Dave Houlton
|
dc1453af9c
|
Merge in from viewer-release 6.3.5
|
2019-11-13 16:46:27 -07:00 |
|
AndreyL ProductEngine
|
f83ada32f7
|
Merged in lindenlab/viewer-release
|
2019-11-13 10:50:25 +02:00 |
|
andreykproductengine
|
f680e5913a
|
SL-6109 Removed LLDrawFrustum and used changes from EEP to prevent merge conflicts
|
2019-11-11 20:38:52 +02:00 |
|
andreykproductengine
|
679a0d7521
|
Backed out changeset: 19f3fa6e3e63
|
2019-11-11 19:43:29 +02:00 |
|
andreykproductengine
|
d616012891
|
SL-6109 Implemented LLDrawFrustum
|
2019-10-01 20:35:59 +03:00 |
|
AndreyL ProductEngine
|
4dd3d230ec
|
Merged in lindenlab/viewer-release
|
2019-11-14 23:44:45 +02:00 |
|
ruslantproductengine
|
2b8acfea0e
|
SL-11840 [Bakes on Mesh] Enable bake textures to be applied to non-attached editable items
- Now bake texture channel's available for assign for non attached objects
|
2019-10-18 22:38:33 +03:00 |
|
AndreyL ProductEngine
|
8e82f50a76
|
Merged in lindenlab/viewer-release
|
2019-09-10 23:31:38 +03:00 |
|
andreykproductengine
|
e439f0366f
|
Merge from lindenlab/viewer-release
|
2019-08-29 15:43:02 +03:00 |
|
Ansariel
|
b660db7324
|
Merge fix
|
2019-08-27 19:21:05 +02:00 |
|
Graham Linden
|
2cd01c8e92
|
Move decl of statics inside func to appease Clang, maybe.
|
2019-08-27 08:59:48 -07:00 |
|
Graham Linden
|
1cf1459cbc
|
Make texture ctrl visibility set respect BOOL vs bool and use better naming.
|
2019-08-26 14:34:15 -07:00 |
|
Graham Linden
|
3dff18eb69
|
Fix merged code use of obsoleted vars and other merge errors.
|
2019-08-26 14:20:04 -07:00 |
|
Graham Linden
|
723f1891db
|
Merge 6.3.1 viewer-release
|
2019-08-26 12:35:18 -07:00 |
|
maxim_productengine
|
dbe5eb8a1d
|
SL-11431 [Legacy Profiles] Clicking someone else's profile picture should open image modal.
|
2019-06-25 17:54:21 +03:00 |
|
Anchor
|
8faaa4b8e2
|
[SL-11433] - fix dirty flag in texture picker
|
2019-06-23 13:09:57 -07:00 |
|
andreykproductengine
|
a2d91f3160
|
DRTVWR-493 LLLocalBitmapMgr to Singleton
|
2019-06-20 20:53:46 +03:00 |
|
Ansariel
|
0d674ea43f
|
Fix merge error
|
2019-05-13 20:32:17 +02:00 |
|
Anchor
|
504a138cb1
|
Merge
|
2019-05-10 12:22:29 -06:00 |
|
Graham Linden
|
42fa05bd4c
|
Remove unref'd vars for Clang.
|
2019-05-08 12:49:02 -07:00 |
|
Graham Linden
|
470d1595cc
|
Merge viewer-release
|
2019-05-08 09:30:39 -07:00 |
|
Anchor
|
490bdacf58
|
[SL-1172] - fix selected saved textures not working
|
2019-02-05 21:21:52 -08:00 |
|
andreykproductengine
|
ac865de287
|
SL-1945 Day Cycle Editor Copy Track
|
2019-01-25 22:02:16 +02:00 |
|
maxim_productengine
|
ab428e194e
|
SL-1866 FIXED [OSX] Viewer crashes when the user changes avatar after editing texture
|
2019-01-04 10:57:49 +02:00 |
|
maxim_productengine
|
bf2efcf43e
|
SL-10233 FIXED 'Default' button doesn't work in 'Pick:Texture' floater for multiple selections with different textures
|
2018-12-14 16:48:54 +02:00 |
|
Anchor Linden
|
dcbf57ab2d
|
[MAINT-8846] - fixing duplicate id in avatar_lad.xml fixrs character test female crash. code cleanup.
|
2018-07-15 21:33:02 +05:30 |
|
Anchor Linden
|
917ab7be9e
|
[MAINT 8434] - fix mode select doesnt change on drag n drop,
[MAINT 8410] - fix eye dropper still active after switching to bake mode,
[MAINT 8464] - fix bake mode active for non attached objects
|
2018-06-28 05:14:29 +05:30 |
|
Anchor Linden
|
b48ca9da47
|
Merge
|
2018-06-27 17:45:35 +05:30 |