Commit Graph

31130 Commits (4fffc8c8e458ed13993fd0d5bc07ff641cb56005)

Author SHA1 Message Date
Jonathan Yap 4fffc8c8e4 STORM-2031 Display issues with Top colliders/Top scripts floater
OPEN-217 Change to media_plugin_quicktime.cpp causes Windows compile to fail
2014-05-13 12:30:29 -04:00
Oz Linden d0ef02c23a increment viewer version to 3.7.8 2014-05-06 15:13:49 -04:00
Oz Linden 38ac07ea39 Added tag 3.7.7-release for changeset 83959480cb98 2014-05-06 15:12:41 -04:00
Xiaohong Bao ae564140c0 Merge 2014-04-22 12:19:28 -06:00
Oz Linden c71e459bed increment viewer version to 3.7.7 2014-04-21 14:50:54 -04:00
Oz Linden d05f620c55 Added tag 3.7.6-release for changeset d029faf69f20 2014-04-21 14:50:53 -04:00
Aura Linden 3c1674f786 Undo of overzealous removal. 2014-04-16 11:08:52 -07:00
Aura Linden a39c5926fc maint-5707 window should no longer be displayed. 2014-04-15 14:57:47 -07:00
Aura Linden 13727121a5 Disabled 'Sending to server Try N' messages from crash reporting. 2014-04-15 10:35:40 -07:00
Aura Linden e9976b07f9 Merges in fix for Maint-5707 2014-04-15 10:32:13 -07:00
Aura Linden e5dae42252 Fix for MAINT-5707 bad breakpad behavior with teleport links 2014-04-14 15:11:42 -07:00
Richard Linden e36b905395 revived some deleted files to get mac build working 2014-04-08 18:00:54 -07:00
Richard Linden a677d87d0f fix for build errors...removed duplicate definition of getpid on windows 2014-04-07 19:32:24 -07:00
Richard Linden 98aabdc176 merge with release 2014-04-07 19:09:40 -07:00
Aura Linden 828ff16183 Pulled viewer-vivox4.6 into this branch for future RC. 2014-04-07 17:10:28 -07:00
Aura Linden d476b12ae5 Merged viewer release into vivox 2014-04-07 17:04:09 -07:00
Merov Linden c9a9ab1b6a Pull merge from lindenlab/viewer-release 2014-04-07 16:31:32 -07:00
Oz Linden 7e966f28da increment viewer version to 3.7.6 2014-04-07 15:12:21 -04:00
Oz Linden 130e78d0a0 Added tag 3.7.5-release for changeset fc066b82343f 2014-04-07 15:12:21 -04:00
Aura Linden dfd78e83d9 Pulled merge from release 2014-03-27 11:59:35 -07:00
Aura Linden 1d15ac293b Double init of logging probably due to merge fail. 2014-03-26 05:26:10 -07:00
Aura Linden 9ea2694c0e Not ideal but sufficient. 2014-03-26 02:07:29 -07:00
Aura Linden 88b23a5153 Merged 2014-03-25 18:34:02 -07:00
Aura Linden 5b7929364b Still wasn't doing the right thing with log files. 2014-03-25 18:30:39 -07:00
Aura Linden 77432c1ed2 It would help to specify the correct destination directory genius. 2014-03-25 17:26:59 -07:00
Aura Linden fdb65d2c28 Fixed dumb mistake. 2014-03-25 14:05:51 -07:00
Aura Linden 0893b49ebd The simple approach has not worked. This hybrid solution should avoid the Windows issues and get us per-run logfiles. 2014-03-24 22:44:51 -07:00
Merov Linden 78eada5b6c Pull merge from lindenlab/viewer-release 2014-03-24 21:07:57 -07:00
Richard Linden e5bbdafded merge with release 2014-03-24 19:23:34 -07:00
Aura Linden 877f87a360 Old is the new new. 2014-03-24 15:19:03 -07:00
Aura Linden 77ec712b15 Merged in viewer-release. 2014-03-24 11:30:17 -07:00
Oz Linden 31a3a3da5d increment viewer version to 3.7.5 2014-03-24 14:20:14 -04:00
Oz Linden 0f9c05af1d Added tag 3.7.4-release for changeset d076568ff788 2014-03-24 14:16:45 -04:00
Oz Linden 6db0a2a7ea merge changes for DRTVWR-360 2014-03-24 14:15:56 -04:00
Aura Linden 103529e074 Pulled merge from release. 2014-03-24 09:59:53 -07:00
Aura Linden 489f265be2 Current log was actually correct. 2014-03-21 13:58:39 -07:00
Aura Linden 35ab71d8ea Returned Secondlife.log to main directory due to unforeseen LLErrorThread complexities. 2014-03-20 12:04:39 -07:00
Merov Linden cb2bd57709 ACME-1376 : Take the location checkbox out of the photo panel 2014-03-17 14:59:49 -07:00
Monty Brandenberg 0bc8e67ebb Mac Debug build is functional with this manifest change 2014-03-15 18:18:58 -04:00
Monty Brandenberg 1e764fb668 Consistent set of fmodex 4.44.31 builds now. 2014-03-14 21:14:32 -04:00
Monty Brandenberg c62d2cca29 Additions & fixes for lib copy, use only forwarded ptrs in LLAE interfaces.
Copy3rdPartyLibs needed to copy the now-corrected fmodexL libraries
and it had a bad library reference on Linux for release.  In
llaudio land, the audio engine interfaces, even the fmodex
specializations, seem to want to be external-structure free
so use a forward declaration and pointer to FMOD_DSP_DESCRIPTION
and deal with it in the ctor/dtor.
2014-03-14 20:58:35 -04:00
Monty Brandenberg 4f565ed077 Update fmodex to 4.44.31. Move DSP descriptor to heap storage. 2014-03-14 19:48:35 -04:00
Aura Linden 8d5b933ad0 Probable fix for linux hang. 2014-03-13 23:33:12 +00:00
Aura Linden 706ec08deb Merged in viewer-release 2014-03-13 21:55:22 +00:00
Richard Linden 5b846ed2a6 merge with release 2014-03-12 12:48:43 -07:00
Monty Brandenberg 9c29000ba2 Merge. Refresh from viewer-release after 3.7.3 release. 2014-03-10 20:34:43 -04:00
Merov Linden 5690becdf4 Pull merge from lindenlab/viewer-release 2014-03-10 16:20:09 -07:00
Oz Linden cb91708332 increment viewer version to 3.7.4 2014-03-10 14:33:54 -04:00
Oz Linden d1e1a2a7d3 Added tag 3.7.3-release for changeset 962d3f98955b 2014-03-10 14:33:54 -04: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