Commit Graph

278 Commits (77f56fa7bf6404ebcda4d17c1229336243fac4cf)

Author SHA1 Message Date
Ansariel da365b227e Merge Firestorm LGPL 2019-12-13 18:15:19 +01:00
Ansariel 589fc9c7e5 Add missing localized floater header for outfit picture texture picker 2019-12-01 16:52:40 +01:00
Ansariel 0b6b4c7097 Merge Firestorm LGPL 2019-11-15 19:05:26 +01:00
Ansariel d79b79fbe2 Merge viewer-ordered-shutdown 2019-10-19 03:16:10 +02:00
andreykproductengine e439f0366f Merge from lindenlab/viewer-release 2019-08-29 15:43:02 +03: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
Ansariel 892d224446 Merge Firestorm LGPL 2019-01-31 21:10:17 +01:00
andreykproductengine ac865de287 SL-1945 Day Cycle Editor Copy Track 2019-01-25 22:02:16 +02:00
Ansariel dd2636a2c2 Merge viewer-neko 2019-01-10 21:10:36 +01: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
Ansariel f9ec853f4a Merge viewer-neko 2019-01-03 19:07:09 +01:00
maxim_productengine ec3e360098 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
Ansariel 9944015842 Merge viewer-baking-updates 2018-08-03 13:21:08 +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
Ansariel 7392f82e71 Merge Firestorm LGPL 2018-06-21 20:56:19 +02:00
Ansariel e97c25531c Merge viewer-neko 2018-05-25 22:05:19 +02:00
maxim_productengine 3c12c7ce56 MAINT-8619 Disable local textures for selection in Group profile 2018-05-23 11:58:42 +03:00
Ansariel 31b62685f2 Merge viewer-baking-updates 2018-05-22 17:23:58 +02:00
Anchor Linden 3bf89821d9 [DRTVWR-455] - added 5 new bake channels 2018-05-21 16:00:52 -07:00
Ansariel ce76074b67 Merge viewer-baking-updates 2018-04-14 16:52:12 +02:00