42fa322e76
Merged master (DRTVWR-497) into DRTVWR-514-keymappings
2020-09-28 21:21:13 +03:00
86e7cc3d35
Merge branch 'master' v6.4.9 into DRTVWR-497
2020-09-22 15:28:13 -06:00
c2b55c4362
Merged master(DRTVWR-503) into DRTVWR-514-keymappings
2020-09-22 22:54:36 +03:00
0d78aa31e2
SL-6109 Removed LLDrawFrustum and used changes from EEP to prevent merge conflicts
2020-06-23 14:50:59 +03:00
2022c91e2d
Backed out changeset: 19f3fa6e3e63
2020-06-23 14:50:59 +03:00
0147a8c989
SL-6109 Implemented LLDrawFrustum
2020-06-23 14:49:39 +03:00
efc3715713
Buildfix
2020-05-05 01:31:22 +03:00
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
7a311fe30e
Merge branch 'master' into DRTVWR-497
2020-04-20 21:21:12 +03:00
cfb2b95c8c
SL-12641 Remade 'Pick: Texture' floater to eliminate translation overlaps
2020-02-18 18:33:28 +02:00
56056aa198
Upstream merge from viewer-neko
2019-11-27 23:20:03 +02:00
dc1453af9c
Merge in from viewer-release 6.3.5
2019-11-13 16:46:27 -07:00
f680e5913a
SL-6109 Removed LLDrawFrustum and used changes from EEP to prevent merge conflicts
2019-11-11 20:38:52 +02:00
679a0d7521
Backed out changeset: 19f3fa6e3e63
2019-11-11 19:43:29 +02:00
d616012891
SL-6109 Implemented LLDrawFrustum
2019-10-01 20:35:59 +03:00
4dd3d230ec
Merged in lindenlab/viewer-release
2019-11-14 23:44:45 +02:00
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
e439f0366f
Merge from lindenlab/viewer-release
2019-08-29 15:43:02 +03:00
b660db7324
Merge fix
2019-08-27 19:21:05 +02:00
2cd01c8e92
Move decl of statics inside func to appease Clang, maybe.
2019-08-27 08:59:48 -07:00
1cf1459cbc
Make texture ctrl visibility set respect BOOL vs bool and use better naming.
2019-08-26 14:34:15 -07:00
3dff18eb69
Fix merged code use of obsoleted vars and other merge errors.
2019-08-26 14:20:04 -07:00
723f1891db
Merge 6.3.1 viewer-release
2019-08-26 12:35:18 -07:00
8faaa4b8e2
[SL-11433] - fix dirty flag in texture picker
2019-06-23 13:09:57 -07:00
a2d91f3160
DRTVWR-493 LLLocalBitmapMgr to Singleton
2019-06-20 20:53:46 +03:00
0d674ea43f
Fix merge error
2019-05-13 20:32:17 +02:00
504a138cb1
Merge
2019-05-10 12:22:29 -06:00
42fa05bd4c
Remove unref'd vars for Clang.
2019-05-08 12:49:02 -07:00
470d1595cc
Merge viewer-release
2019-05-08 09:30:39 -07:00
490bdacf58
[SL-1172] - fix selected saved textures not working
2019-02-05 21:21:52 -08:00
ac865de287
SL-1945 Day Cycle Editor Copy Track
2019-01-25 22:02:16 +02:00
ab428e194e
SL-1866 FIXED [OSX] Viewer crashes when the user changes avatar after editing texture
2019-01-04 10:57:49 +02:00
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
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
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
b48ca9da47
Merge
2018-06-27 17:45:35 +05:30
3c12c7ce56
MAINT-8619 Disable local textures for selection in Group profile
2018-05-23 11:58:42 +03:00
3bf89821d9
[DRTVWR-455] - added 5 new bake channels
2018-05-21 16:00:52 -07:00
130d3ab6bc
MAINT-8438: Setting attachment bake texture to None does not refresh the base avatar bake.
2018-03-29 10:33:04 -07:00
7c6dcae680
MAINT-8438: Setting attachment bake texture to None does not refresh the base avatar bake
2018-03-29 10:29:30 -07:00
513d1728c3
MAINT-8438,8446: fix bakes on child prims
2018-03-28 17:21:03 -07:00
f335414435
fixed MAINT-8413,8409,8408
2018-03-21 01:40:35 -07:00
8f64a9edea
[MAINT 8081] - show/hide avatar base mesh regions if avatar joint attachments are using server bakes. pass the magic ids correctly across ui and texture entry.
2018-03-02 02:25:59 -08:00
bfbcd6d169
[MAINT-8081] - bakes on mesh. 1st pass. changed texture panel to select bakes on objects. handle magic bake ids in LLViewerObject.
2018-02-28 22:14:38 -08:00
334d853527
MAINT-6961 FIXED Some textures(copied from Library) couldn't be set as Outfit image via "Select image" although drag and drop works fine
2016-11-25 16:12:31 +02:00
fb0355fdba
Merged in Ansariel/storm-2141
2016-11-21 21:18:13 +02:00
420b1c9429
STORM-2141: Fix various inventory floater related issues:
...
* Opening new inventory via Control-Shift-I shortcut uses legacy and potentinally dangerous code path
* Closing new inventory windows don't release memory
* During shutdown legacy and inoperable code for inventory window cleanup is called
* Remove old and unused inventory legacy code
2016-11-14 14:45:53 +01:00
c2b6620572
Merged in lindenlab/viewer-release
2016-09-15 23:21:15 +03:00
c37b822abf
MAINT-6616 new crash in VOB viewer in snapshot preview
2016-08-23 18:53:27 +03:00
0f06168991
MAINT-6655 Group inspector doesn't support default icon.
2016-08-17 20:35:00 +03:00
Andrey Kleshchev