6db0a2a7ea
merge changes for DRTVWR-360
2014-03-24 14:15:56 -04:00
cb2bd57709
ACME-1376 : Take the location checkbox out of the photo panel
2014-03-17 14:59:49 -07:00
0bc8e67ebb
Mac Debug build is functional with this manifest change
2014-03-15 18:18:58 -04:00
1e764fb668
Consistent set of fmodex 4.44.31 builds now.
2014-03-14 21:14:32 -04:00
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
4f565ed077
Update fmodex to 4.44.31. Move DSP descriptor to heap storage.
2014-03-14 19:48:35 -04:00
9c29000ba2
Merge. Refresh from viewer-release after 3.7.3 release.
2014-03-10 20:34:43 -04:00
cb91708332
increment viewer version to 3.7.4
2014-03-10 14:33:54 -04:00
d1e1a2a7d3
Added tag 3.7.3-release for changeset 962d3f98955b
2014-03-10 14:33:54 -04: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
28d3bb0975
[MAINT-3555][MAINT-3703]
...
- Removed logging for MAINT-3555
- Added NULL guard to fix MAINT-3703 (hopefully)
2014-03-03 11:53:57 -08:00
3f9f8bb8bf
Merge JJ's viewer-release-codesign-workaround
2014-02-27 13:28:56 -08:00
0a46023db5
Fix linux build - make default check in switch statement
2014-02-26 23:52:34 +00:00
556506278a
Merged lindenlab/viewer-release into default
2014-02-26 10:16:07 -08:00
483ad8dc55
MAINT-3555 FIXED crash in LLPanel::~LLPanel() on shutdown:
...
- LLFloaterView::mToolbarRects[3] was transformed to LLRect mToolbarLeftRect, mToolbarBottomRect, mToolbarRightRect;
2014-02-26 20:14:41 +02:00
100b9154dd
MAINT-3555 : crash in LLPanel::~LLPanel() on shutdown. Fixes to be paranoid
...
about the return type for calls to LLView::getParent(): never assume a down
cast is possible.
2014-02-26 12:49:29 -08:00
6f1df3172e
Merge viewer-release
2014-02-25 16:45:19 -08:00
9c31fab51b
merge
2014-02-25 16:42:44 -08:00
bd73465e51
[MAINT-3784] - Viewer takes too long to shut down
...
- Removed a lot of logging code to reduce application close time
2014-02-25 16:41:23 -08:00
de8fea1362
increment viewer version to 3.7.3
2014-02-24 14:50:35 -05:00
7910c686ca
Added tag 3.7.2-release for changeset b842534cb4d7
2014-02-24 14:50:35 -05:00
0abdab7848
changed variable names and errors to more accurately reflect the operation being performed
2014-02-21 11:59:17 -08:00
7028d24c2c
Merge oz_linden/viewer-fewerpkgs
2014-02-21 11:00:28 -08:00
7faaaa9b11
[MAINT-3555] Adding a bajillion log messages to (hopefully) narrow down the cause of the crash
2014-02-20 15:23:53 -08:00
8ead3308be
remove experimental cdn packages
2014-02-20 16:44:41 -05:00
ba0b11fee1
Fix build problem
2014-02-20 19:45:47 +02:00
251bf8ceca
duplicated the workaround added for darwin codesigning onto the windos codesigning
2014-02-19 14:40:27 -08:00
acb265a394
Merge. Refresh from viewer-release after 3.7.1 release.
2014-02-14 18:49:33 -05:00
ce7e19d33a
increment viewer version to 3.7.2
2014-02-14 16:00:45 -05:00
cb9e53414d
Added tag 3.7.1-release for changeset dcb4981ce255
2014-02-14 16:00:45 -05:00
7443819560
Merge. Refresh from viewer-release after 3.7.0 release
2014-02-11 13:41:31 -05:00
8d0f7fe571
Hack to fix ACME-1317
2014-02-11 00:09:59 +00:00
413be91cf5
increment viewer version to 3.7.1
2014-02-10 16:00:37 -05:00
b236cdbe8c
Added tag 3.7.0-release for changeset 5d746de933a9
2014-02-10 16:00:37 -05:00
e6c85c46c4
MAINT-3555 crash in LLPanel::~LLPanel() on shutdown:
...
- memory leaks fixing;
2014-02-05 20:45:09 +02:00
54ab932884
Merge viewer-release with 3.7.1
2014-02-14 15:57:27 -08:00
38915f119c
More memory cleanup of containers after DeletePairedPointer() usage.
2014-02-14 14:57:08 -08:00
6bb9975de1
MAINT-3724 : LLWorld::addRegion logging is misleading
2014-02-14 14:02:34 -08:00
38c6c55794
merge
2014-02-14 13:57:49 -08:00
d7b902d575
[MAINT-3555] Crash in LLPanel::~LLPanel() on shutdown
...
- Added clear() after DeletePointer() call to hopfully fix this...
2014-02-14 13:56:36 -08:00
e7021407cb
MAINT-3639 disable ALM for OSX 10.6.8
2014-02-11 10:16:11 -08:00
49ade5a719
Pointless merge to make hg happy
2014-02-10 16:16:34 -08:00
4acc2dc273
Merge viewer-release
2014-02-10 15:42:25 -08:00
1be85e1a0a
MAINT-3710 FIXED List of members is removed from General tab. Title column is added to the list in Members tab. Roles tab is renamed to Roles & Members and Roles sub-tab is default now.
2014-02-10 12:09:32 +02:00
9bb2bc6099
fix odd editor artifact
2014-01-30 14:18:58 -05:00
80ee8a8ca3
Another build trigger
2014-01-30 13:17:17 -05:00
32880362fe
merge fixes for recording the packages installed in the build
2014-01-29 18:36:01 -05:00
7b1e1e4e35
FITMESH-6: correct bounds checking
2014-01-29 18:25:03 -05:00
636953b7d7
another trigger edit
2014-01-29 16:27:59 -05:00
dae8c4158a
Trivial edit to stimulate a new build.
2014-01-27 16:21:56 -05:00
Oz Linden