6babf8abd2
Merge LL 3.7.7
2014-06-09 11:29:57 -07:00
87bcc46ff5
Merge LL 3.7.4
2014-03-25 06:54:26 -07:00
e5bbdafded
merge with release
2014-03-24 19:23:34 -07:00
36050289f9
Prevent raceconditions.
2014-03-19 21:44:49 +01:00
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
8c4825c382
initialize critical section once
2013-11-02 21:36:28 -07:00
460f499c1e
Work around glib functions that had been deprecated with glib 2.35.
2013-11-23 15:11:12 +01:00
52da9f5f49
merge with viewer-release
2013-09-09 18:58:41 -07:00
e340009fc5
second phase summer cleaning
...
replace llinfos, lldebugs, etc with new LL_INFOS(), LL_DEBUGS(), etc.
2013-08-09 17:11:19 -07:00
a2a6bf20d7
merge with release
2013-06-20 16:46:23 -07:00
9c83d4b5b8
Merge with viewer-release.
2013-06-19 15:47:57 -04:00
0a96b47663
merge with viewer-release
2013-06-05 19:05:43 -07:00
c38204f5e0
Unwind cruft from hunting for 2707 they won't end up in vwr-dev-mat
2013-06-05 14:26:27 -07:00
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
62d3a010d4
BUG-2707 disable sites calling OsOutputDebugString directly to identify which is tossing our errant exception
2013-06-03 18:11:08 -07: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
68f9f656cd
merge with viewer-release
2013-03-22 00:44:59 -07:00
98e02a5d76
Merge new boost and add OS X 10.8 mods
2013-02-22 09:49:58 -08:00
11d12f1a99
Merge from viewer-beta
2013-02-13 11:30:36 -05:00
5a6c0198d9
Merged with latest viewer-dev.
2013-02-06 14:53:04 -05:00
2fa8205d4d
MAINT-2281: correct test for XP (corrected fix I applied incorrectly)
2013-01-29 18:39:51 -05:00
276800e6f2
MAINT-2281: correct test for XP
2013-01-29 18:09:13 -05:00
f39532c407
Merged with latest viewer-dev.
2013-01-24 16:36:31 -05: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
e41ca4b4b8
merge RLVa update
2013-11-11 00:40:45 -08:00
81613d30d5
Compile fixes for 2012/3 (from Alchemy, by Drake Arconis)
2013-10-28 18:36:04 -07:00
329ca38457
Merge with -lgpl.
2013-09-14 23:23:26 +02:00
ab881aca17
Merged with default tip (Revision 2dfdd2b8ef88)
...
--HG--
branch : Viewer-Build
2013-09-10 20:47:01 +02:00
c69f3acef8
Merge LL 3.6.5
2013-09-09 19:07:03 -06:00
0addf213ed
Merge with FS tip. First pass.
2013-08-02 00:40:48 +02:00
bdee194522
Fix some easy little pointer confusions for 64 bit versions.
2013-08-01 23:52:49 +02:00
9584c77333
Merged with default tip (Revision 74cc289067c8)
...
--HG--
branch : Viewer-Build
2013-07-13 23:31:38 +02:00
2e81151012
Merged with default tip (Revision 9b1b6f33aa53)
...
--HG--
branch : Viewer-Build
2013-07-13 22:34:26 +02:00
fe30eea25e
- fixed : viewer fails to compile with only the Windows 8 SDK installed
...
--HG--
branch : Viewer-Build
2013-05-27 19:24:42 +02:00
718f6fa0ff
merge LL 3.6.1
2013-07-10 00:23:23 -07:00
d4640277d0
Merge LL 3.5.3 release.
2013-07-09 16:24:58 -07:00
02816087d9
Backout a8b492b8e561. It's doing not much good during the later parts of newview compilation.
2013-06-29 18:52:35 +02:00
1c6fdd35cf
Fix for newer GCC versions.
2013-06-27 21:20:07 +02:00
90fb925d84
fix line endings
2013-01-11 15:23:18 -08:00
44cc14fbee
fix for mac builds
2013-01-11 13:11:07 -08:00
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
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
88fe6da622
FIX (SPECULATIVE) MAINT-1340 - Media Volume control broken on Vista+ systems
2012-12-18 11:44:20 -08:00
c06c35609c
Updating linux build to gcc4.6
2012-10-11 00:09:04 +00:00
c9ab9590aa
Removing server-related cmake cruft. Fixing libGLU warnings on linux.
2012-10-04 03:12:48 +00: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
Tank_Master