Commit Graph

128 Commits (c4e18fbcaab2413d153ec79356930bf667839b4f)

Author SHA1 Message Date
Ansariel c9e417c8a6 Merge viewer-neko 2017-11-30 01:19:29 +01:00
andreykproductengine 629840e9a8 MAINT-1804 Fixed bulk upload failures due to non-ansi symbols in names 2017-11-22 16:48:54 +02:00
andreykproductengine c877206569 MAINT-1139 Catch Windows crash on Saving snapshot 2017-05-26 15:11:37 +03:00
andreykproductengine fe49c1e8a5 MAINT-1139 Catch Windows crash on Saving snapshot 2017-05-26 15:11:37 +03:00
Nicky 080b10358f FIRE-8051; Make sure filenames do not get cut off via wrong calucation of string length. 2016-11-22 23:48:47 +01:00
Ansariel 2797c5938a Merge Firestorm LGPL 2016-04-05 10:47:23 +02:00
Oz Linden 9be58e915a merge with 4.0.3-release 2016-04-04 15:53:09 -04:00
Ansariel 3192fe832f Merge viewer-quickgraphics 2016-03-08 01:41:31 +01:00
Oz Linden c8726aba30 remove execute permission from many files that should not have it 2015-11-10 09:48:56 -05:00
Nicky c218e524b2 Merge - Step 1; Still enough to do. 2015-10-26 20:20:13 +01:00
Rider Linden fd27f0feb8 MAINT-5507: Include httpconstants in file picker for linux. 2015-09-16 09:09:55 -07:00
Ansariel cc32221af7 Remove one of the XML filepicker types for Mac that doesn't need to be there anymore 2015-01-20 19:59:49 +01:00
Tonya Souther e6130ff458 Compile fix for OS X. 2015-01-20 12:44:15 -06:00
Ansariel 99cbf150a0 Merge LL V3.7.21 2015-01-15 13:55:17 +01:00
Ansariel 1f465086c0 Merge LL V3.7.10 2015-01-11 18:40:22 +01:00
Ansariel f4bfb1aadf Merge LL V3.7.9 (AIS3 + SSA) 2014-10-22 02:02:08 +02:00
Cinder 19330025ba OPEN-268 - Add missing xml cases to file picker on linux and darwin 2014-08-31 06:17:57 -06:00
Merov Linden c4c8debfc2 Pull merge from lindenlab/viewer-release 2014-06-17 11:12:27 -07:00
Merov Linden 51865f4e94 Pull merge from lindenlab/viewer-release 2014-05-19 21:43:42 -07:00
Brad Payne (Vir Linden) 67051b26ba merge 2014-05-19 18:10:45 -04:00
Brad Payne (Vir Linden) 7b9708a2e3 sunshine-external merge WIP 2014-05-13 10:02:26 -04:00
simon 250db74bf9 Pull and merge viewer-release as version 3.7.8 2014-05-07 10:56:41 -07:00
Merov Linden 8dae4bc222 Pull merge from lindenlab/viewer-release. Fixed some conflicts and compile errors 2014-05-06 18:21:04 -07:00
Tank_Master dc353c205a Merge 2014-06-10 20:27:31 -07:00
Tank_Master 6babf8abd2 Merge LL 3.7.7 2014-06-09 11:29:57 -07:00
maxim@mnikolenko 930f407a1c MAINT-3642 FIXED Allow saving textures with extension “.tga” at the end of the name. 2014-01-24 12:12:43 +02:00
Mnikolenko ProductEngine a462c5f14b MAINT-3262 FIXED Allow uploading gif-images 2014-01-14 11:47:40 +02:00
Merov Linden be80b11d30 Fix FFLOAD_ALL issue in file picker, add FFLOAD_EXE to fix exe picking on Mac Cocoa 2013-12-18 11:12:46 -08:00
Brad Payne (Vir Linden) 744cf6be8d merge 2013-12-05 10:39:35 -05:00
Mnikolenko ProductEngine 21d9e524f6 MAINT-3262 FIXED Cannot select image to upload to Web profile 2013-12-05 12:51:36 +02:00
Richard Linden 17e9c872ad Automated merge with http://bitbucket.org/lindenlab/viewer-release 2013-11-11 19:17:49 -08:00
Brad Payne (Vir Linden) 1f8b37e9ad merge 2013-10-16 11:52:43 -04:00
Richard Linden 80dfbbaacd merge from viewer-release 2013-10-08 11:59:24 -07:00
Cinders 195d6998f7 Remove unused add_csv_filter_to_gtkchooser() function completely 2013-12-08 17:03:14 -07:00
Nicky 60cec9a2ba More Linux build fixing. 2013-12-09 00:21:41 +01:00
Ansariel d997da9346 Linux build fix 2013-12-09 00:04:31 +01:00
Cinders 95f518746a FIRE-12276: Group membership export to csv 2013-12-08 08:52:29 -07:00
Cinders 41e32c8515 Whitespace cleanup 2013-11-23 22:33:56 -07:00
Tank_Master 3603c4f992 Merge ll 3.6.11 2013-11-23 20:22:24 -08:00
Cinder Biscuits 5b7da1998a BUG-3848: send_agent_resume() was not being called after snapshot. 2013-09-10 22:12:18 +00:00
Brad Payne (Vir Linden) e6a68e1f09 merge 2013-09-10 15:30:13 -04:00
Richard Linden 52da9f5f49 merge with viewer-release 2013-09-09 18:58:41 -07:00
maxim@mnikolenko e4c43d6bed MAINT-3247 FIXED Check that gfilter is not NULL. 2013-10-04 13:43:45 +03:00
Graham Madarasz (Graham Linden) b8a1fd33f5 Try all you want multichar constant, but you'll never be a string to me! (fix mac build errors from 'curious' filepicker literals) 2013-09-26 10:12:33 -07:00
simon_linden d3625d0b67 Merge downstream code 2013-09-19 15:30:34 -07:00
simon_linden e2019e8a3b Merge downstream code with viewer-release 2013-09-09 16:17:16 -07:00
callum_linden 2503f825ec MAINT-2897 Need to be able to save textures from inventory as PNG 2013-08-14 15:50:37 -07:00
dmitrykproductengine be9d946375 MAINT-2897 MAINT-2897 Need to be able to save textures from inventory as PNG 2013-08-14 11:32:23 +03:00
Richard Linden e340009fc5 second phase summer cleaning
replace llinfos, lldebugs, etc with new LL_INFOS(), LL_DEBUGS(), etc.
2013-08-09 17:11:19 -07:00
Brad Payne (Vir Linden) a04a706c1b merge 2013-05-21 16:18:48 -04:00