a45088cb6b
Merge LL V3.7.11
2015-01-12 12:54:15 +01:00
a98b4b6bee
merge changes for 3.7.7-release
2014-05-07 11:09:04 -04:00
e9116575bf
OPEN-209: Corrected all instances of trigraphs in the code.
...
Trigraphs can cause some real special headaches. The only part that's annoying is the comment in newview/llimview.cpp where there's an unfortunate collision of a trigraph sequence with a character sequence that could be displayed by the viewer. Thankfully, it's only a comment!
2014-03-13 20:36:05 -07:00
2455a0a8e0
Replaced even deprecated logging macros.
2014-06-11 18:24:52 +02:00
6babf8abd2
Merge LL 3.7.7
2014-06-09 11:29:57 -07:00
2ced379763
Removing a missed gSavedSettings call from llwindow legacy cursors recode
2014-05-19 19:19:26 -07:00
abe269ac06
Fixing merge comments
2014-05-19 19:14:05 -07:00
1d0d21b5f5
Fixing linux build
2014-05-19 19:13:32 -07:00
97a45e7597
Cleaning up legacy cursors and adding merge guard comments on changed code
2014-05-19 16:54:18 -07:00
c9719151d9
Fix legacy cursor hotspots on mac and linux builds
2014-05-18 20:28:10 -07:00
ee88720b8a
Backed out changeset: ec54b058227c
2014-05-18 20:02:31 -07:00
6a74754813
Dump broken legacy V1 cursors nobody seem to fix, miss or care about for over 2 years
2014-05-14 19:13:46 +02:00
fe24e442a6
BUILDFIX: converted platform-specific files over to new LL_INFOS, etc macros
2013-08-14 20:50:26 -07: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
cec50f8c14
Fix for gcc 4.6 build failures on Linux in llwindowsdl.cpp
2013-03-13 19:17:13 +00:00
9ea6a96be9
LLWindow merge fixes for Mac
2013-03-11 17:29:05 -04:00
11fe124ae9
merging in viewer-beta.
...
Most of the merge was clean, a couple conflicts.
Brought over a couple patches manually for llpolymesh.
2013-01-24 16:22:49 -05:00
aa73973514
Work around glib functions that had been deprecated with glib 2.32.
2013-01-23 21:15:14 +01:00
db4543dbf8
Adhere to standard OSX app practices and bounce the icon whenever Firestorm is not the active app
2013-10-02 00:32:36 -06:00
338ae29e8f
Fix opening log transcripts and folders on linux. FIRE-11533
2013-09-02 22:04:05 +02:00
d4640277d0
Merge LL 3.5.3 release.
2013-07-09 16:24:58 -07:00
14001c54df
Gastly CHUI merge pass 1, don't count on anything to work.
2013-06-26 12:14:54 -07:00
716e2ea3b1
Pull and merge viewer-development
2012-12-12 10:58:47 -08:00
65998aaea8
Pull from viewer-development
2012-12-05 12:43:35 -05:00
3e8fdb9daa
Fixed previous commit.
2012-12-01 00:12:32 +00:00
6cff95f8c7
Fix for STORM-1854. Adapted the fix based on other open source consumers of fontconfig that were encountering the same error.
2012-11-30 18:26:56 -05:00
a567c425ca
MAINT-536 MAINT-1913 Added missing URL scheme filtering to the Linux viewer, changed URL scheme whitelist. Reviewed by Callum.
2012-11-14 02:24:58 +00:00
c06c35609c
Updating linux build to gcc4.6
2012-10-11 00:09:04 +00:00
d3924200b6
Removing unused gHeadlessClient code from viewer
2012-09-23 03:06:11 +00:00
9e2db5a173
PATH-852: BUGFIX Adding the custom pathfinding cursors to the mac and linux builds as apparently they never worked there.
2012-08-13 18:28:34 -07:00
6207030884
Merge FS LGPL tip
2013-02-23 17:09:53 -08:00
ea86bb88c3
first pass merge
2013-02-04 10:52:32 -08:00
169263d8b0
Merge LL 3.4.5 beta 3
2013-01-28 01:56:00 -08:00
5d276272e6
Add a best-guess workaround for fullscreen aspect ratio being off on Linux systems with dual monitors - FIRE-8825
2013-01-06 16:13:09 +01:00
1762586923
Merge LL 3.4.4 beta 1, but left tcmalloc enabled.
2012-12-21 01:14:38 -08:00
1b585cc713
Better fix for reopening files to /dev/null for web browser on Linux.
2012-10-16 12:16:39 -05:00
b3236055d1
Fix a crash when using FontConfig 2.9.
2012-09-26 23:16:13 +02:00
4fb0a3bf13
PATH-852: BUGFIX Adding the custom pathfinding cursors to the mac and linux builds as apparently they never worked there.
2012-08-13 18:28:34 -07:00
1c55d5cbb6
Merge LL 3.3.2 release
2012-05-28 17:02:11 -07:00
9da67fff0a
EXP-1832 FIX Viewer Size not persistent across logins
...
made Set Window Size correctly set interior window rect, preserving measured dimensions
2012-02-23 12:39:32 -08:00
dd9263d017
Automated merge with http://hg.secondlife.com/viewer-development
2011-12-08 11:02:00 -08:00
1c71b90300
EXP-1651 FIXED Added saving window size after each reshape.
...
Fixed broken resize indicator on Linux viewer window (EXP-1580).
2011-12-06 21:43:58 +02: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
1e2d424f9e
STORM-1713: Mouse pointer flickers when hovering over any active/clickable UI item
2011-12-05 23:35:29 +01:00
c191f523a9
Automated merge with http://hg.secondlife.com/viewer-development
2011-11-30 17:57:09 -08:00
1a7e49ece8
EXP-1580 FIXED applying "MinWindowWidth" and "MinWindowHeight" settings to Linux viewer window.
...
Added minimum size setting method for X11 viewer window on Linux.
2011-11-30 01:01:22 +02:00
9a5a96aadc
EXP-1580 FIXED resize indicator on Linux showing Viewer window can be resized below minimum size.
...
Fixed using minimum window dimensions configured in debug settings.
2011-11-29 16:45:10 +02:00
20221c8e77
EXP-1485 FIX -- Viewer should have a minimum size
...
moved min size logic into LLWindow
2011-11-28 12:51:15 -08:00
b69be18d7b
merge changes for vmrg-193
2011-11-24 06:56:57 -05:00
Ansariel