d972efa64c
ACME-1244 : WIP : Execute filters in Flickr panel. Testable but code beeds clean up.
2014-01-13 17:56:38 -08:00
54ad7de61b
ACME-1244 : Introduced llimage/llimagefilter, refactored the filter execution code, simplified llimage_libtest filter testing
2014-01-13 17:01:44 -08:00
bc1cecd754
Removing the value "void" from return types and empty argument lists.
2014-01-14 00:22:41 +00:00
640fb0376d
STORM-1831 Updated XML defaults file. Adding some recently added constants. Changed indenting to a single space. Adding the Relax schema file that is referenced in the XML.
2014-01-14 00:19:03 +00:00
5342d0c570
ACME-1256 : Rename and cleanup in the default filters
2014-01-13 14:36:42 -08:00
bd800bc2ef
Pull merge from lindenlab/viewer-release
2014-01-13 19:45:10 +00:00
541ea58f44
Updated indenting of XML file to use a single tab per indent level. This also reduces the file size by over 200KB
2014-01-11 04:41:56 +00:00
025e0b07ab
Correcting int to U32
2014-01-11 03:19:34 +00:00
2202150af4
ACME-1243 : WIP : Populate filter drop down with filter list dynamically
2014-01-11 01:00:35 +00:00
a712aab616
added some defensive asserts in lltrace to make cases of misuse more obvious when it crashes
2014-01-10 13:56:35 -08:00
32cef0ad14
Merge after backout
2014-01-10 13:17:26 -08:00
cfadbe631f
Revert earlier back-out for MAINT-535 ... it's back in
2014-01-10 13:15:19 -08:00
0c7cab771c
ACME-1236 : Add lines as a new type of vignette and Brightscan as an example
2014-01-09 21:58:30 -08:00
3455bf9589
Automated merge with http://bitbucket.org/lindenlab/viewer-interesting
2014-01-09 21:18:37 -07:00
87f852ee67
fix for SH-4659:crash at LLOcclusionCullingGroup::doOcclusion line 1150
2014-01-09 21:17:49 -07:00
a2f9aea3b4
Pull merge from viewer-acme-dev
2014-01-10 01:27:33 +00:00
7d8e402075
ACME-1244 : WIP : Move files around and introduced an llimagefiltersmanager to get the filters
2014-01-09 17:25:01 -08:00
d8f627d8bd
merge
2014-01-09 17:52:21 -05:00
883c0773f3
Merge. Refresh from viewer-release after 3.6.13 release.
2014-01-09 15:26:02 -05:00
15e6939342
merge with release
2014-01-09 12:22:24 -08:00
1d0d485b69
Merge
2014-01-09 12:19:13 -08:00
b2fe32e572
SH-4667 HTTP Viewer reports network error instead of a misnamed joint on mesh upload
...
Tried to add consistent mesh upload retries in the HTTP work but a
combination of bad status choices in the upload service and the
one-shot nature of the upload capabilities means that status
information can be lost. For now, retain the wonderful manual
retry logic. At some future point, we might fix the services or
add application-level retry.
2014-01-09 15:18:54 -05:00
516061275b
fixed unit tests being generated as Windows GUI projects instead of console projects
2014-01-09 12:18:34 -08:00
6b4a357230
Merge 3.6.14 from release
2014-01-09 10:53:01 -08:00
70b877da0e
Fix ambiguous pow call (use powf) instead
2014-01-08 21:19:21 -08:00
f1bb5c5ada
merge changes for 3.6.13-release
2014-01-08 18:47:21 -05:00
d8a81b240e
increment viewer version to 3.6.14
2014-01-08 18:46:23 -05:00
19a41cc243
Added tag 3.6.13-release for changeset 0d9b9e50f1a8
2014-01-08 18:45:48 -05:00
ac3becf8d8
Pull merge from lindenlab/viewer-acme
2014-01-08 15:45:07 -08:00
1c705489c4
ACME-1236 : WIP : Added Newspaper filter to the bank of filters
2014-01-08 15:42:52 -08:00
3161d822ab
ACME-1236 : WIP : Added mode and angle parameter to filterScreen (renamed for consistency)
2014-01-08 15:41:42 -08:00
dea35b4bac
Removed support for secondlife:///app/slshare for ACME-1263
2014-01-08 20:06:26 +00:00
6a11332552
trivial: convert to unix line endings.
2014-01-08 11:56:55 -07:00
9489dbe2c1
MAINT-3591 FIXED Remove "Start Second LIfe now?" dialogue in the installer
2014-01-08 20:25:40 +02:00
ae57f0ed1a
MAINT-3412 add gpu_table line with distinct Intel Iris Pro OpenGL regex to match new MBP with forced Intel graphics
2014-01-14 14:22:14 -08:00
724b5f1222
merge
2014-01-14 23:45:55 +02:00
a462c5f14b
MAINT-3262 FIXED Allow uploading gif-images
2014-01-14 11:47:40 +02:00
4d81b1d967
MAINT-3510 (Incorrect context menu entry in Places floater)
2014-01-14 10:00:30 +02:00
c934710f76
MAINT-3621 FIXED Set name to "Unnamed" if object's name consists of whitespaces.
2014-01-13 12:08:00 +02:00
a1e986e2b0
MAINT-3364 FIXED Call clearSelection() from root_folder
2014-01-10 12:37:01 +02:00
ade7faae58
Merge downstream -bear
2014-01-09 10:56:44 -08:00
e89bda2586
Merge 3.6.14
2014-01-09 10:50:20 -08:00
a4173dc81a
STORM-68 Remove obsolete note. Refactor a few blocks of code to not have early returns
2014-01-08 09:30:30 -05:00
c243578337
MAINT-3520 FIXED Сall arrange(NULL, NULL) to avoid occasional drag'n'drop folders after renaming.
2014-01-08 12:34:35 +02:00
c2a974f155
ACME-1236 : WIP : Introduced screenFilter, simple creative screening filter
2014-01-07 22:10:23 -08:00
a773cdd6f7
Fix linux build
2014-01-08 02:36:12 +00:00
57d9fa36bd
Pull merge from lindenlab/viewer-acme
2014-01-07 16:24:13 -08:00
0696ac9384
ACME-1236 : WIP : Add filter files to app_settings/filters (not loaded yet)
2014-01-07 16:21:17 -08:00
5187e709c9
ACME-1236 : WIP : Add filter file loading and execution to llimage_libtest, suppress the a la Instagram tests as a result
2014-01-07 16:17:25 -08:00
f291995dac
Revert changes made for MAINT-535 to test in a release cohort.
2014-01-07 15:18:29 -08:00
Merov Linden