Commit Graph

320 Commits (ec00f7f14fbf16992b71ddd54e583ba07fdfd523)

Author SHA1 Message Date
Oz Linden ddd5659f81 merge changes for DRTVWR-294 2013-04-19 10:11:29 -04:00
Graham Madarasz bf6182daa8 Update Mac and Windows breakpad builds to latest 2013-03-29 07:50:08 -07:00
Don Kjer cec50f8c14 Fix for gcc 4.6 build failures on Linux in llwindowsdl.cpp 2013-03-13 19:17:13 +00:00
prep 9ea6a96be9 LLWindow merge fixes for Mac 2013-03-11 17:29:05 -04:00
prep 207d9fd767 Viewer-chui merge 2013-03-11 14:45:53 -04:00
Nyx Linden 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
simon@Simon-PC.lindenlab.com 716e2ea3b1 Pull and merge viewer-development 2012-12-12 10:58:47 -08:00
prep 65998aaea8 Pull from viewer-development 2012-12-05 12:43:35 -05:00
simon@Simon-PC.lindenlab.com 7fe4fbe674 Pull in upstream viewer-development via viewer-lion 2012-12-04 15:03:34 -08:00
simon@Simon-PC.lindenlab.com 40e78a80cc Pull and merge viewer-development 2012-12-04 14:31:15 -08:00
Logan Dethrow 3e8fdb9daa Fixed previous commit. 2012-12-01 00:12:32 +00:00
Logan Dethrow 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
prep e0432f98ee SH-3563. Pull and merge from viewer-development. Modest code changes to fix alignment issue in llAppearance. 2012-11-28 16:36:34 -05:00
Nat Goodspeed aaf96507a1 Some Mac header #defines macros like check and equivalent -- gack!!
Given that third-party libraries (such as Boost) can and do use those names,
properly namespace-scoped, it's unpardonable to break any such innocent usage
with a macro. Given the pervasiveness of the need, introduce a header file
with the requisite #undef directives.
2012-11-16 18:08:40 -05:00
Maestro Linden 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
Don Kjer cc5f8686fe Speeding up cmake configuration, especially on linux. Re-arranged llrender/llwindow cmake source a bit 2012-10-15 17:36:51 +00:00
Don Kjer c06c35609c Updating linux build to gcc4.6 2012-10-11 00:09:04 +00:00
Don Kjer e858c172fc Updating to newer build of tcmalloc/google perf tools. Removing X11 library dependencies from headless libraries 2012-10-04 22:00:24 +00:00
Don Kjer 21df924a10 Building headless and non-headless libraries side-by-side, removing the need for the BAKING cmake setting. 2012-10-04 06:29:07 +00:00
Don Kjer c9ab9590aa Removing server-related cmake cruft. Fixing libGLU warnings on linux. 2012-10-04 03:12:48 +00:00
Don Kjer d3924200b6 Removing unused gHeadlessClient code from viewer 2012-09-23 03:06:11 +00:00
Nyx Linden 49caededb4 BUILDFIX: enabling the building of the viewer/appearance backend with headless mesa 2012-09-19 17:05:56 +00:00
Don Kjer 8ba2b38876 Fleshed out target_link_libraries dependencies between libraries. Appearance utility now reads avatar_lad.xml during stubbed out params processing. 2012-09-13 10:25:48 +00:00
simon@Simon-PC.lindenlab.com 38acb45af8 Merge in latest viewer-development 2012-09-05 17:17:54 -07:00
Todd Stinson 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
Todd Stinson 4feef5af63 Pull and merge from ssh://hg@bitbucket.org/lindenlab/viewer-release. 2012-07-23 19:21:34 -07:00
simon@Simon-PC.lindenlab.com b7555a3309 Merge back viewer-lion, which has viewer-development and down-stream fixes 2012-08-01 14:07:24 -07:00
Dave Parks 4a5ad35793 MAINT-570 Remove unused memory tracking system LLMemType 2012-07-20 11:42:15 -05:00
Todd Stinson bf1c1947d7 PATH-743: Updating the cursors for path testing mode to final designs. 2012-06-25 14:28:21 -07:00
Todd Stinson 6e710333e7 Pull and merge from ssh://hg@bitbucket.org/lindenlab/viewer-release. 2012-06-22 18:59:31 -07:00
Dave Parks 9e9d32de38 merge 2012-06-22 14:04:33 -05:00
Todd Stinson 11b6e272ab PATH-743: Altering the mouse cursor to give more feed back when in path testing mode. 2012-06-21 16:39:35 -07:00
Oz Linden f64a79d9d1 merge changes for DRTVWR-171 2012-06-21 14:19:25 -04:00
Dave Parks 99dc246ac8 Merge 2012-06-15 14:29:46 -05:00
Todd Stinson b8bc62a514 Pull and merge from ssh://hg@bitbucket.org/lindenlab/viewer-release. 2012-05-25 18:45:27 -07:00
simon@Simon-PC.lindenlab.com 1777fa5187 Merge pull from lindenlab/viewer-development as requested by Oz for DRTVWR-148 2012-05-25 15:07:22 -07:00
William Todd Stinson 7faa89ba6e BUILDFIX: Correcting linux and mac build issues. 2012-05-24 22:40:50 -07:00
Todd Stinson 9b27e32a8d Removing unused setting that is blocking my path to commit the subsequent change. 2012-05-24 16:07:31 -07:00
Nat Goodspeed 78f2663c4a Automated merge with http://hg.secondlife.com/viewer-release 2012-04-26 14:04:55 -04:00
Todd Stinson 6aeb2c68b9 Refining the behavior of the pathing test tool behavior with regards to mouse clicks. 2012-04-11 13:20:54 -07:00
Todd Stinson 2115211328 Re-implementing the path testing functionality as a proper LLTool. 2012-04-09 18:53:52 -07:00
Dave Parks 76eeeadeaa MAINT-771 Add RenderAutoHideSurfaceAreaLimit debug setting for protecting against sculpt based crashers. 2012-03-19 15:31:10 -05:00
Richard Linden 874a67776b fix for mac build 2012-02-27 14:02:09 -08:00
Richard Linden 8024727d45 EXP-1832 WIP Viewer Size not persistent across logins
fixed not unmaximizing properly on Windows
put in error logging on Mac
2012-02-27 11:26:08 -08:00
Vadim ProductEngine 4e24022b8c EXP-1305 FIXED Prevent avatar from walking after double-clicking the title bar. 2012-02-27 15:54:41 +02:00
Richard Linden f4a122b6d7 Automated merge with ssh://hg.lindenlab.com/richard/viewer-experience 2012-02-23 12:40:27 -08:00
Richard Linden 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
Seth ProductEngine bc4d0b0b0f Linux build fix.
Moved type casts from protected base classes to derived LLCoord.
(transplanted from fa4c01adac7224b909ab1dbfc90416b633e6d6c2)
2012-02-23 21:02:46 +02:00
Nat Goodspeed 0249a0d1e7 Automated merge with http://hg.secondlife.com/viewer-release 2012-04-26 14:07:09 -04:00
Dave Parks 002c9b3f3d MAINT-516 Potential fix for crash on startup in LLWindowWin32::switchContext 2012-04-11 16:02:24 -05:00