Commit Graph

240 Commits (680194deaf7a35caaa629abc16e886d71baff636)

Author SHA1 Message Date
callum_linden 3929725fe7 Update to build on Xcode 6.0: Use of unary operator might be an error 2014-10-17 22:06:58 -07:00
Oz Linden d3c63401d2 merge changes for 3.7.14-release 2014-08-18 14:38:46 -04:00
Monty Brandenberg 5b542e227b All: Committing to llqtwebkit2 and the future. Updating all libraries.
Updating SDL to 290561, c-ares to 290399, Boost to 290566, colladadom
to 290576, curl to 290567, fontconfig to 290569, freetype to 290557,
google-mock to 290574, libpng to 290558, libxml2 to 290562, llqtwebkit
to 290578, openssl to 290560, PCRE to 290406, zlib to 290556.  Document
compiling and linking in new 00-COMPILE-LINK-RUN.txt in indra/cmake.  It
is the README for the building process based on things learned during
this library project.  Switch building process back to style used for
new llqtwebkit2 repo.  This builds shared libraries for Qt4 products
on all platforms using current build machines and TC task templates.
All platforms are building.  All have comparable FPS rates.  Builds are
getting quieter.  Forward, comrades!
2014-06-03 19:37:58 -04:00
Monty Brandenberg 403ec62e3c All: Update library SDL to 290309, c-ares to 290089, boost to 290191,
colladadom to 290229, curl to 290186, fontconfig to 290258, freetype to 290255,
google-mock/gmock/gtest to 290199, libpng to 290081, libxml2 to 290157,
llqtwebkit to 290262/250147 (to be fixed shortly), openssl to 290083,
pcre to 290150, zlib to 290080.  The freetype2 headers are now normalized
to what they would normally be on a unix-type system.  Libxml2 and
pcre are available on all platforms.  Libraries generally move in the
direction of static archives rather than shared libraries (e.g. openssl).
The llqtwebkit side is a step back from the more ambitious goal.  What
will be used (290262) will be a simple rebuild of the existing 4.7.1
library with updated package dependencies.  The bigger work will be in
the future.
2014-05-28 19:40:45 +00:00
Monty Brandenberg 060c728970 Merge. Pull in viewer-release after release of 3.7.8 2014-05-22 22:08:54 +00:00
Jonathan Yap ce27987c87 STORM-2030 Rapidly clicking the refresh button in selected floaters may result in duplicate entries 2014-05-12 16:25:48 -04:00
Monty Brandenberg e72d546fe3 Mac: Update llqtwebkit build, build and package dylib Qt4 pieces.
Part of the switchover to dynamic Qt4.  This mostly completes the
Mac side.  Webkit is functional on Mac, plugins work.  The two
test programs, llfbconnectest and llplugintest, need a little
more work to run without manual fixup ('.' on PATH and maybe a
symlink to libz.1.dylib and they run and function on Mac).  Also
need to address libz.dylib vs libz.a.  Currently resolving against
dylib which is not what I want.
2014-04-11 19:19:22 -04:00
Richard Linden e5bbdafded merge with release 2014-03-24 19:23:34 -07:00
Monty Brandenberg 71e237a3f7 MAINT-3703 Suspected thread race crasher in fmodex library
Two problems found in DLL involving threads.  First, DllMain
was reinitializing a critical section for all entry reasons
(process attach, detach and thread attach, detach).  Should
only be done on process attach.  Second, static container
object was being modified and accessed without serialization.
Added some double-check locking to the initialization path
to reduce the total number of serialization calls made while
making the code thread safe.
2014-03-10 12:16:49 -04:00
Richard Linden 8c4825c382 initialize critical section once 2013-11-02 21:36:28 -07:00
Richard Linden 52da9f5f49 merge with viewer-release 2013-09-09 18:58:41 -07: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
Richard Linden a2a6bf20d7 merge with release 2013-06-20 16:46:23 -07:00
Geenz 9c83d4b5b8 Merge with viewer-release. 2013-06-19 15:47:57 -04:00
Richard Linden 0a96b47663 merge with viewer-release 2013-06-05 19:05:43 -07:00
Graham Madarasz c38204f5e0 Unwind cruft from hunting for 2707 they won't end up in vwr-dev-mat 2013-06-05 14:26:27 -07:00
Graham Madarasz ea24612561 BUG-2707 make use of OsOutputDebugString _DEBUG only on Windows to avoid throwing unhandlable exceptions in coroutines in RelWithDebInfo builds 2013-06-04 07:51:27 -07:00
Graham Madarasz 62d3a010d4 BUG-2707 disable sites calling OsOutputDebugString directly to identify which is tossing our errant exception 2013-06-03 18:11:08 -07:00
Geenz 3779e51bfc Merged with https://bitbucket.org/lindenlab/viewer-beta 2013-05-13 22:22:51 -04:00
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
Richard Linden 68f9f656cd merge with viewer-release 2013-03-22 00:44:59 -07:00
Graham Madarasz (Graham Linden) 98e02a5d76 Merge new boost and add OS X 10.8 mods 2013-02-22 09:49:58 -08:00
prep 11d12f1a99 Merge from viewer-beta 2013-02-13 11:30:36 -05:00
Geenz 5a6c0198d9 Merged with latest viewer-dev. 2013-02-06 14:53:04 -05:00
Oz Linden 2fa8205d4d MAINT-2281: correct test for XP (corrected fix I applied incorrectly) 2013-01-29 18:39:51 -05:00
callum_linden 276800e6f2 MAINT-2281: correct test for XP 2013-01-29 18:09:13 -05:00
Geenz f39532c407 Merged with latest viewer-dev. 2013-01-24 16:36:31 -05: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
callum_linden 90fb925d84 fix line endings 2013-01-11 15:23:18 -08:00
Richard Linden 44cc14fbee fix for mac builds 2013-01-11 13:11:07 -08:00
Geenz bd152c1fb7 Huge amount of refactoring to use Cocoa here:
- Updated to .xib format.  To produce a new nib (which is required after changing the xib file), use "ibtool SecondLife.xib --compile SecondLife.nib" within the newview directory.
- xib file now defines the viewer's window.  VIews are still being pragmatically added to the main window.  This may change in the future.
- LLAppViewer's main loop has been slightly refactored to be executed on a timer for OS X.  This probably needs a bit more work.
- Event handling still needs more work to work within a timer based event loop.  It works fairly sporadically at the moment, as if events are being dropped between timer executions, at least for the mouse.
- Carbon has been purged from the viewer's startup, and from LLWindow entirely.  There's likely still a few odds and ends fragmented throughout the viewer and its dependencies.  Need to track these down.
- LLAppViewerMacOSX now uses NSApplicationMain, and also implements the NSApplicationDelegate protocol in LLAppDelegate.
- Fullscreen support has been implemented for OS X 10.7+
This is still a work in progress, however at this stage everything needed for a functional viewer is (mostly) complete.  From here, it's mostly just bug hunting and fixing.
2012-12-29 06:59:43 -05:00
Richard Linden 3fd640a6e3 SH-3468 WIP add memory tracking base class
fixed crash on exit by making LLInstanceTracker iterators use atomic iterator
nesting count for thread safety
2012-12-23 12:27:25 -08:00
callum_linden 88fe6da622 FIX (SPECULATIVE) MAINT-1340 - Media Volume control broken on Vista+ systems 2012-12-18 11:44:20 -08:00
Don Kjer c06c35609c Updating linux build to gcc4.6 2012-10-11 00:09:04 +00:00
Don Kjer c9ab9590aa Removing server-related cmake cruft. Fixing libGLU warnings on linux. 2012-10-04 03:12:48 +00:00
Richard Linden 5a14a67e06 converted a bunch of narrowing implicit conversions to explicit 2012-02-01 13:03:46 -08:00
callum 2a19aa93e9 Point to improved loading overlay and turn it on always 2011-11-10 19:00:03 -08:00
callum 91354304fc Turn off debug loading overlay for older versions of LLQtWebKit thar do not support it (Linux) 2011-11-02 15:05:55 -07:00
callum 2777ddd060 Added more logging and elapsed time counter to log message. 2011-10-31 15:35:04 -07:00
callum 9399b66dc4 Tie debugging/loading overlay to media debugging flag 2011-10-31 11:33:41 -07:00
callum b94f45db81 Merge with head 2011-10-28 11:01:11 -07:00
callum 343562889e EXP-1471 WIP Add support for zooming web pages by a scale facxtor 2011-10-25 19:34:05 -07:00
Dave Parks c0ca8e5e2e Merge backout of b782a75c99e6 2011-10-14 11:58:35 -05:00
Dave Parks 4331c112ab Backed out changeset b782a75c99e6 2011-10-14 11:52:40 -05:00
Leslie Linden 1c57963673 Removed windows line endings to conform to coding policy. 2011-09-12 11:30:24 -07:00
Richard Linden fc45e9cbf6 Automated merge with http://hg.secondlife.com/viewer-development 2011-09-02 20:24:06 -07:00
Xiaohong Bao 749d9ebadc Merge 2011-08-31 10:48:56 -06:00
callum d341c400fc EXP-1122 FIX (Viewer) LLQtWebKit should support a JavaScript/content debugger to help content creators
Viewer side changes to enable Web debugger.
2011-08-29 17:13:29 -07:00
callum 0bf3ee7fa7 EXP-1111 FIX LLQtWebKit (and related media system) should log events, progress etc. to make debugging problems easier 2011-08-26 17:27:15 -07:00