Ansariel
|
9f3cbadd29
|
Merge branch 'master' of https://vcs.firestormviewer.org/phoenix-firestorm
|
2022-08-04 14:18:46 +02: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 |
|
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 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 |
|
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
|
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 |
|
Ansariel
|
589fc9c7e5
|
Add missing localized floater header for outfit picture texture picker
|
2019-12-01 16:52:40 +01:00 |
|
AndreyL ProductEngine
|
56056aa198
|
Upstream merge from viewer-neko
|
2019-11-27 23:20:03 +02:00 |
|
Ansariel
|
0b6b4c7097
|
Merge Firestorm LGPL
|
2019-11-15 19:05:26 +01:00 |
|
Dave Houlton
|
dc1453af9c
|
Merge in from viewer-release 6.3.5
|
2019-11-13 16:46:27 -07:00 |
|
Ansariel
|
229a6928e9
|
Merge Firestorm LGPL
|
2019-11-12 23:22:39 +01:00 |
|
Ansariel
|
506ef7ae7c
|
Merge Firestorm LGPL
|
2019-11-12 21:42:19 +01: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 |
|
Ansariel
|
209f3700d1
|
Merge viewer-cougar
|
2019-10-30 18:58:52 +01:00 |
|
Ansariel
|
d79b79fbe2
|
Merge viewer-ordered-shutdown
|
2019-10-19 03:16:10 +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 |
|
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 |
|
andreykproductengine
|
e439f0366f
|
Merge from lindenlab/viewer-release
|
2019-08-29 15:43:02 +03:00 |
|
Ansariel
|
8f9eba0dea
|
Merge Firestorm LGPL
|
2019-08-28 17:35:34 +02:00 |
|
Ansariel
|
b660db7324
|
Merge fix
|
2019-08-27 19:21:05 +02:00 |