195d6998f7
Remove unused add_csv_filter_to_gtkchooser() function completely
2013-12-08 17:03:14 -07:00
60cec9a2ba
More Linux build fixing.
2013-12-09 00:21:41 +01:00
d997da9346
Linux build fix
2013-12-09 00:04:31 +01:00
95f518746a
FIRE-12276: Group membership export to csv
2013-12-08 08:52:29 -07:00
41e32c8515
Whitespace cleanup
2013-11-23 22:33:56 -07:00
3603c4f992
Merge ll 3.6.11
2013-11-23 20:22:24 -08:00
e4c43d6bed
MAINT-3247 FIXED Check that gfilter is not NULL.
2013-10-04 13:43:45 +03:00
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
d3625d0b67
Merge downstream code
2013-09-19 15:30:34 -07:00
5b7da1998a
BUG-3848: send_agent_resume() was not being called after snapshot.
2013-09-10 22:12:18 +00:00
e2019e8a3b
Merge downstream code with viewer-release
2013-09-09 16:17:16 -07:00
2503f825ec
MAINT-2897 Need to be able to save textures from inventory as PNG
2013-08-14 15:50:37 -07:00
be9d946375
MAINT-2897 MAINT-2897 Need to be able to save textures from inventory as PNG
2013-08-14 11:32:23 +03:00
3779e51bfc
Merged with https://bitbucket.org/lindenlab/viewer-beta
2013-05-13 22:22:51 -04:00
ddd5659f81
merge changes for DRTVWR-294
2013-04-19 10:11:29 -04:00
bf6182daa8
Update Mac and Windows breakpad builds to latest
2013-03-29 07:50:08 -07:00
484c0d7ac9
Add missing filters for darwin filepicker
2013-11-04 19:42:56 -07:00
1ddec81e0a
FIRE-11793/BUG-4053/MAINT-3262 Cannot select image to upload to Web profile. This is because anding F_NAV_SUPPORT clears F_FILE. Whereas in fact we want both (OR).
2013-10-04 01:23:23 +02:00
d41651f829
Remove now unused function
2013-09-20 04:59:13 -06:00
c6e89f4880
Oops, fix a break in FFSAVE_COLLADA that was lost in the 3.6.5 merge
2013-09-19 22:23:22 -06:00
fd37f371ac
Small fixes to import filters
2013-09-19 21:57:30 -06:00
4f09d71bd8
Clean up my sloppy commit and fixes to threaded file pickers
2013-09-10 16:28:36 -06:00
5d72fa20b7
Fix for BUG-3838 - send_agent_resume() not called after snapshot
2013-09-10 16:02:53 -06:00
c69f3acef8
Merge LL 3.6.5
2013-09-09 19:07:03 -06:00
239426a9b5
gcc 4.6 compile fixes.
2013-08-27 19:25:17 -05:00
f6628f47e1
Add Collada dad export with permission from Latif Khalifa of Singularity, with modifications
2013-08-27 17:49:30 -06:00
3f9a1da042
Recovered changes for dirpicker and filepicker
2013-01-23 10:41:52 -08:00
d4640277d0
Merge LL 3.5.3 release.
2013-07-09 16:24:58 -07:00
9636c78195
Compile fix in LLFilePicker
2013-03-25 23:24:21 +01:00
0eed7b149e
Filepicker filters for import/export
2013-03-25 15:47:29 -06:00
49caededb4
BUILDFIX: enabling the building of the viewer/appearance backend with headless mesa
2012-09-19 17:05:56 +00:00
ea86bb88c3
first pass merge
2013-02-04 10:52:32 -08:00
ac8da149cc
FIRE-5782: Fix build on OSX
2012-10-20 21:12:43 -06:00
eb66474f18
Fix compile errors when compiling for Linux.
2012-10-17 14:06:13 +02:00
b6ed0e6930
FIRE-5782 - Threaded filepickers for uploads
2012-10-06 12:29:16 -06:00
10275e9bb1
corrected build problem detected on Mac
2012-06-15 17:40:07 -04:00
f15fc05fd2
STORM-276 Ease-of-use importing of Open Office dictionary extensions
2012-06-15 20:47:02 +02:00
cb24ec2e0d
merge LL 3.3.4 beta
...
autoreplace does not work (needs a hook in nearby chat), no cmd line option to add new stuff
spellcheck only works when packaged
2012-07-16 21:59:14 -07:00
20210455f5
STORM-276 Dictionary import functionality and floater
2012-06-04 16:10:32 +02:00
633bd44b4a
merge changes for vmrg-225
2012-03-09 12:58:50 -05:00
e61c20d499
Merge LL 3.3.1 Viewer Release
2012-04-26 17:31:35 -07:00
449d2b106f
STORM-1803 Fix syntax error that the Windows compiler did not complain about
2012-02-07 10:25:18 -05:00
619f737abb
STORM-1803 Adding raw anim file upload support
2012-01-29 15:34:51 -05:00
fc2fb09d6b
Backed out changeset: 52e691caf9a2 (initial asset blacklist (Not ready for release))
2012-03-14 23:02:41 -07:00
16022b89fa
Added Asset Blacklist feature from NaCl Viewer / Chalice Yao (FIRE-1059)
2012-02-22 18:01:51 +01:00
8f60dc0136
EXT-1836 FIXED Avoid assigning NULL to an std::string.
2012-01-23 17:50:04 +02:00
032a5e4572
Replacing file filter for windows that was mistakenly removed.
2011-12-25 23:09:32 +00:00
9890e5cbed
STORM-1708 Darwin UI additions
2011-12-07 21:37:08 +00:00
161c1b019f
Merge up from 24496 / a656486925e8 (FS tip) to 25952 / 931cb0061118 (V/Dev FUI tip)
...
Observations and broken stuff so far:
- LLSideTray is gone.
- LLBottomTray is gone.
- LLFloaterSnapshot was changed and gave lots of merge conflicts. Flickr upload will be broken.
- LLNearbyChat is derived from LLPanel now. That broke quite some stuff rearding autohiding and docking of chatbar.
- Profile floaters are gone and all web based now.
- Russian translation gave huge mere conflicts with the new russian xml files from LL. Unmergeable. I took the LL files.
- XUI files in general will need some love and testing.
2012-01-17 17:57:52 +01:00
5535722ea5
STORM-1708 Linux UI additions
2011-12-01 12:31:56 +00:00
Cinders