Ansariel
|
2b1a3b22e9
|
FIRE-30431: Keep radio button mode selection in texture selection
|
2020-11-05 12:46:32 +01:00 |
|
Ansariel
|
4bbdafb17e
|
Merge branch 'master' of https://vcs.firestormviewer.org/phoenix-firestorm
|
2020-09-23 08:31:25 +02: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 |
|
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
|
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
|
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 |
|
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 |
|
Ansariel
|
9b3cba1fa6
|
Merge viewer-eep except the usual screw-up
|
2019-08-27 19:18:05 +02:00 |
|
Ansariel
|
de837a5800
|
Merge Firestorm LGPL
|
2019-08-27 19:04:14 +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 |
|
Ansariel
|
56f5faef0a
|
Merge Firestorm LGPL
|
2019-07-23 21:20:05 +02:00 |
|
Ansariel
|
d82f98180c
|
Merge Firestorm LGPL
|
2019-07-12 20:13:35 +02:00 |
|
Liny
|
b073349a12
|
Forgot one place
Patch from Chaser Zaks
|
2019-06-25 22:50:02 -07:00 |
|
Liny
|
07deb7b5a7
|
FIRE-24113 - Texture Picker UUID string change to 0s when you don't own the texture
Patch from Chaser Zaks
|
2019-06-25 22:05:02 -07:00 |
|
Ansariel
|
945e7f3c48
|
Merge viewer-baking-updates
|
2019-06-24 19:08:55 +02:00 |
|
Ansariel
|
d9f802792a
|
Merge Firestorm LGPL
|
2019-06-24 19:03:49 +02: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
|
0ec08c1b0f
|
Merge viewer-eep
|
2019-05-21 18:22:45 +02:00 |
|
Tonya Souther
|
f45c19cdb3
|
FIRE-14230: Allow applying a texture via UUID to the current selection in the texture picker. Patch from Chaser Zaks.
|
2019-06-22 15:14:41 -05: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 |
|
Ansariel
|
3df9aff40f
|
Merge Firestorm LGPL
|
2019-05-09 23:48:20 +02:00 |
|
Ansariel
|
e6970af7a1
|
Merge Firestorm LGPL
|
2019-05-09 19:52:27 +02: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 |
|
Ansariel
|
7fc586e2f2
|
Merge Firestorm LGPL
|
2019-03-01 19:12:02 +01:00 |
|
Ansariel
|
3556faaf36
|
Merge viewer-baking-updates
|
2019-03-01 19:10:28 +01:00 |
|
Ansariel
|
53cea223fe
|
Merge Firestorm LGPL
|
2019-02-14 19:56:05 +01:00 |
|
Ansariel
|
f8ad1551b3
|
Merge viewer-eep
|
2019-02-10 13:12:23 +01:00 |
|
Ansariel
|
d0be7ba28b
|
FIRE-23582: Fix texture picker opens wrong floater when pressing space in preview mode
|
2019-02-08 20:18:35 +01:00 |
|
Anchor
|
490bdacf58
|
[SL-1172] - fix selected saved textures not working
|
2019-02-05 21:21:52 -08:00 |