Ansariel
|
cb1cb4b505
|
Merge branch 'DRTVWR-567' of https://github.com/secondlife/viewer
|
2023-07-28 18:20:13 +02:00 |
|
Mnikolenko Productengine
|
1cf4a2c952
|
SL-20080 Show warning message when selecting a non square texture for thumbnails
|
2023-07-27 13:30:09 +03:00 |
|
Andrey Kleshchev
|
b267515922
|
SL-20068 Selecting from texture picker for thumbnail does not assign thumbnail
|
2023-07-25 22:06:23 +03:00 |
|
Ansariel
|
4ebb423335
|
Merge branch 'DRTVWR-567' of https://github.com/secondlife/viewer
# Conflicts:
# indra/newview/llaisapi.cpp
# indra/newview/llinventorygallery.cpp
# indra/newview/lltexturectrl.cpp
|
2023-07-22 11:47:19 +02:00 |
|
Andrey Kleshchev
|
7b9206dfd1
|
SL-20045 Texture picker should apply the exact texture inventory item
|
2023-07-22 00:51:44 +03:00 |
|
Ansariel
|
a520340900
|
Merge branch 'DRTVWR-567' of https://github.com/secondlife/viewer
# Conflicts:
# indra/newview/app_settings/settings.xml
# indra/newview/llsidepanelinventory.cpp
# indra/newview/lltexturectrl.cpp
# indra/newview/skins/default/xui/en/floater_texture_ctrl.xml
# indra/newview/skins/default/xui/en/panel_outfit_gallery.xml
|
2023-07-04 14:42:05 +02:00 |
|
Andrey Kleshchev
|
ab18293d35
|
SL-19929 Picker's warning small adjustment
|
2023-06-30 00:42:55 +03:00 |
|
Andrey Kleshchev
|
7c100d54dd
|
SL-19928 Make thumbnail selection failures more user friendly
|
2023-06-29 12:32:51 +03:00 |
|
Ansariel
|
7bcb251661
|
Merge branch 'DRTVWR-567' of https://github.com/secondlife/viewer
# Conflicts:
# autobuild.xml
# indra/llmessage/llcoproceduremanager.cpp
# indra/llui/lllayoutstack.h
# indra/newview/llfloatersidepanelcontainer.h
# indra/newview/llinventorybridge.cpp
# indra/newview/llinventoryfilter.cpp
# indra/newview/llinventoryfilter.h
# indra/newview/llinventorymodelbackgroundfetch.cpp
# indra/newview/llinventorymodelbackgroundfetch.h
# indra/newview/llinventorypanel.cpp
# indra/newview/llpanelmaininventory.cpp
# indra/newview/llpanelmaininventory.h
# indra/newview/lltexturectrl.cpp
# indra/newview/skins/default/xui/en/panel_main_inventory.xml
|
2023-04-21 12:08:40 +02:00 |
|
Andrey Kleshchev
|
af30c8c95b
|
SL-19533 Don't try to restart fetchexcessively
No real point restarting, but due to significant changes decided to keep this around and raise asserts instead of removing.
|
2023-04-11 21:20:30 +03:00 |
|
Zi Ree
|
9f0fb244cc
|
Add parameter to texture picker swatch to allow hiding the label at the bottom, expanding the texture to full height
|
2022-09-24 03:43:08 +02:00 |
|
Ansariel
|
9f3cbadd29
|
Merge branch 'master' of https://vcs.firestormviewer.org/phoenix-firestorm
|
2022-08-04 14:18:46 +02:00 |
|
Andrey Kleshchev
|
014d7616b6
|
Merge branch master (DRTVWR-561) into DRTVWR-483
|
2022-08-04 00:15:15 +03:00 |
|
Ansariel
|
fbb6b25677
|
Merge branch 'DRTVWR-486' of https://bitbucket.org/lindenlab/viewer
|
2022-04-19 18:36:48 +02: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 |
|
Ansariel
|
602a82dc33
|
Merge branch 'master' of https://vcs.firestormviewer.org/phoenix-firestorm
|
2020-11-12 10:11:43 +01:00 |
|
Ansariel
|
c4feaee655
|
Merge branch 'master' of https://vcs.firestormviewer.org/phoenix-firestorm
|
2020-11-12 08:51:55 +01:00 |
|
Ansariel
|
2b1a3b22e9
|
FIRE-30431: Keep radio button mode selection in texture selection
|
2020-11-05 12:46:32 +01:00 |
|
Ansariel
|
6c0cbbbc1a
|
Merge branch 'master' of https://vcs.firestormviewer.org/phoenix-firestorm
|
2020-09-29 13:17:06 +02:00 |
|
Ansariel
|
52d81c3f3b
|
Merge branch 'master' of https://vcs.firestormviewer.org/phoenix-firestorm
|
2020-09-28 23:35:33 +02: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 |
|
Ansariel
|
4a9977f19a
|
Merge branch 'master' of https://vcs.firestormviewer.org/phoenix-firestorm
|
2020-09-23 09:48:33 +02:00 |
|
Ansariel
|
4bbdafb17e
|
Merge branch 'master' of https://vcs.firestormviewer.org/phoenix-firestorm
|
2020-09-23 08:31:25 +02:00 |
|
Ansariel
|
efbb274251
|
Merge branch 'master' of https://vcs.firestormviewer.org/phoenix-firestorm
|
2020-09-23 07:33:20 +02: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 |
|
Ansariel
|
722f7f32bc
|
Merge branch 'DRTVWR-486' of https://bitbucket.org/lindenlab/viewer
|
2020-06-25 10:30:06 +02: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 |
|
Ansariel
|
ec87508e9a
|
Merge branch 'DRTVWR-486' of https://bitbucket.org/lindenlab/viewer and keep the copy&paste options as they are without the latest cumbersome mess with even less functionality
|
2020-06-18 13:14:57 +02:00 |
|
Andrey Kleshchev
|
1310fac3b1
|
SL-13359 #5 Implemented revised changes
|
2020-06-17 23:39:42 +03:00 |
|
Ansariel
|
6afd505fa8
|
Merge branch 'DRTVWR-503-maint' of https://bitbucket.org/lindenlab/viewer
|
2020-05-05 15:24:10 +02: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 |
|
Ansariel
|
024c357eb1
|
Merge branch 'master' of https://vcs.firestormviewer.org/viewer-merges/phoenix-firestorm-eep
|
2020-04-23 18:55:47 +02:00 |
|
Ansariel
|
40b39f9990
|
Merge branch 'master' of https://vcs.firestormviewer.org/viewer-merges/phoenix-firestorm-eep
# Conflicts:
# indra/newview/llviewerfloaterreg.cpp
# indra/newview/skins/default/xui/fr/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/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-23 18:13:29 +02: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 |
|
Ansariel
|
da365b227e
|
Merge Firestorm LGPL
|
2019-12-13 18:15:19 +01:00 |
|
Ansariel
|
8d1e285e91
|
Merge Firestorm LGPL
|
2019-12-13 16:23:52 +01:00 |
|
Ansariel
|
8f3213d7d4
|
Merge Firestorm LGPL
|
2019-12-13 00:14:24 +01:00 |