a5bb8839fa
merge fix
2014-05-16 15:47:34 -04:00
7f3e1b7313
merge fix
2014-05-16 13:28:22 -04:00
f2d7dfb1e6
merge fixes
2014-05-16 10:18:53 -04:00
01ad22ce19
fix for bad merge
2014-05-15 12:53:09 -04:00
487ca1bad3
v-r -> s-e merge WIP
2014-05-14 17:50:59 -04:00
7b9708a2e3
sunshine-external merge WIP
2014-05-13 10:02:26 -04:00
d0ef02c23a
increment viewer version to 3.7.8
2014-05-06 15:13:49 -04:00
38ac07ea39
Added tag 3.7.7-release for changeset 83959480cb98
2014-05-06 15:12:41 -04:00
ae564140c0
Merge
2014-04-22 12:19:28 -06:00
d0eb9658f2
merge
2014-04-22 11:19:58 -04:00
c71e459bed
increment viewer version to 3.7.7
2014-04-21 14:50:54 -04:00
d05f620c55
Added tag 3.7.6-release for changeset d029faf69f20
2014-04-21 14:50:53 -04:00
3c1674f786
Undo of overzealous removal.
2014-04-16 11:08:52 -07:00
a39c5926fc
maint-5707 window should no longer be displayed.
2014-04-15 14:57:47 -07:00
13727121a5
Disabled 'Sending to server Try N' messages from crash reporting.
2014-04-15 10:35:40 -07:00
e9976b07f9
Merges in fix for Maint-5707
2014-04-15 10:32:13 -07:00
e5dae42252
Fix for MAINT-5707 bad breakpad behavior with teleport links
2014-04-14 15:11:42 -07:00
e36b905395
revived some deleted files to get mac build working
2014-04-08 18:00:54 -07:00
ea7f34d37a
merge
2014-04-08 13:20:23 -04:00
a677d87d0f
fix for build errors...removed duplicate definition of getpid on windows
2014-04-07 19:32:24 -07:00
98aabdc176
merge with release
2014-04-07 19:09:40 -07:00
828ff16183
Pulled viewer-vivox4.6 into this branch for future RC.
2014-04-07 17:10:28 -07:00
d476b12ae5
Merged viewer release into vivox
2014-04-07 17:04:09 -07:00
c9a9ab1b6a
Pull merge from lindenlab/viewer-release
2014-04-07 16:31:32 -07:00
7e966f28da
increment viewer version to 3.7.6
2014-04-07 15:12:21 -04:00
130e78d0a0
Added tag 3.7.5-release for changeset fc066b82343f
2014-04-07 15:12:21 -04:00
d10ecef615
merge
2014-03-31 11:59:11 -04:00
dfd78e83d9
Pulled merge from release
2014-03-27 11:59:35 -07:00
1d15ac293b
Double init of logging probably due to merge fail.
2014-03-26 05:26:10 -07:00
9ea2694c0e
Not ideal but sufficient.
2014-03-26 02:07:29 -07:00
88b23a5153
Merged
2014-03-25 18:34:02 -07:00
5b7929364b
Still wasn't doing the right thing with log files.
2014-03-25 18:30:39 -07:00
77432c1ed2
It would help to specify the correct destination directory genius.
2014-03-25 17:26:59 -07:00
fdb65d2c28
Fixed dumb mistake.
2014-03-25 14:05:51 -07:00
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
78eada5b6c
Pull merge from lindenlab/viewer-release
2014-03-24 21:07:57 -07:00
e5bbdafded
merge with release
2014-03-24 19:23:34 -07:00
877f87a360
Old is the new new.
2014-03-24 15:19:03 -07:00
77ec712b15
Merged in viewer-release.
2014-03-24 11:30:17 -07:00
31a3a3da5d
increment viewer version to 3.7.5
2014-03-24 14:20:14 -04:00
0f9c05af1d
Added tag 3.7.4-release for changeset d076568ff788
2014-03-24 14:16:45 -04:00
6db0a2a7ea
merge changes for DRTVWR-360
2014-03-24 14:15:56 -04:00
103529e074
Pulled merge from release.
2014-03-24 09:59:53 -07:00
489f265be2
Current log was actually correct.
2014-03-21 13:58:39 -07:00
35ab71d8ea
Returned Secondlife.log to main directory due to unforeseen LLErrorThread complexities.
2014-03-20 12:04:39 -07: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
Brad Payne (Vir Linden)