ddd5659f81
merge changes for DRTVWR-294
2013-04-19 10:11:29 -04:00
88eff41649
Merge with viewer-development
2013-04-17 13:38:04 -07:00
bf6182daa8
Update Mac and Windows breakpad builds to latest
2013-03-29 07:50:08 -07:00
c418d61627
CHUI-667 Upon exit from DND mode, a maximum of one sound should be played. Solution. Added a deferred sound class which will have sound id's added to it and upon unmuting the deferred sounds will be played.
2013-01-25 17:47:36 -08:00
ba3e89b5c7
first push - patch from CmdCupCake plus force FMODEX on
2013-01-18 16:43:19 -08:00
8e6202ad53
STORM-1812 Added teleport started callback
2012-05-31 06:20:12 -04:00
29737cb9c0
STORM-1812 First pass at adding teleport started signal
2012-05-30 17:07:17 -04:00
b2434b2f5e
STORM-1812 Add debugging lines and call audio_update to try to work around a possible race condition
2012-05-30 14:23:43 -04:00
278d3b15e6
STORM-1812 Store playing state from an additional place.
2012-05-20 14:22:38 -04:00
031c3bbcc4
STORM-1812 / subtask STORM-1861 Media auto-play is off - but music stream starts to play anyway when teleport fails
2012-05-18 16:36:11 -04:00
502e89971f
STORM-1812 Tweak how music is restarted for teleport within a parcel
2012-05-14 13:20:06 -04:00
1daac72722
STORM-1812 Music stream does not always restart after teleporting
2012-02-15 08:05:28 -05:00
3193170850
STORM-591 Made change per code review request: disable audio when teleport progress bar is present
...
Added code to start counting the fade in time on login when STATE_STARTED is set
2011-12-05 05:01:38 -05:00
7226b23366
STORM-591 Made mininum fade time 0.01 seconds to prevent divide by zero and negative fade times.
...
Rewrote two blocks of code to eliminate early returns.
2011-12-02 09:22:27 -05:00
2b43a6b8c9
STORM-591 Remove 2 development debug settings and replace them with constants
2011-11-22 13:13:51 -05:00
ed596077c4
STORM-591 Removed commented out debugging lines
2011-11-18 09:47:55 -05:00
526f71053a
STORM-591 Comment out debugging llinfos lines
2011-10-29 05:01:23 -04:00
4cdf396125
STORM-591 As a music fan, I want audio to fade in gently so my immersion is increased
...
Co-written with Robin Cornelius
2011-10-28 17:48:24 -04:00
9b1174243d
EXP-932 Implement system that fades from login page to (either) intro screen or loading screen instead of using a hard cut
...
EXP-938 Turn off in-world audio until fade from intro/loading page complete
EXP-939 Fade from intro/loading page to world, not to image of last login
2011-07-19 17:25:02 -07:00
5b2d4a1698
STORM-163 FIXED Intermittent FPS drop related to "audio" (main thread hangs often on openal lock)
...
Submitting a patch made by Aleric Inglewood (See VWR-14914).
This bug happens for a lot of people, although it might be needed to have a fast multi core machine.
I have seen it on 1.22.10 once, never used 1.23 sorry, and saw it often on snowglobe. I am sure
it also affects 1.23 but I'd have to test that.
The symptons are that on a viewer with normally a good, high FPS, sometimes it happens
that the FPS dramatically drops (as low as 0.3, but it can also be anything higher, as high
as 10, say).
This particular jira is about a problem where the main thread is slowed down by a mutex lock
in libopenal (most calls starting with 'al' in indra/llaudio/audioengine_openal.cpp and
one in indra/llaudio/listener_openal.cpp). You can see that this is the case by opening the
Frame Console (control-shift-2) and checking that the "audio" (and possibly misc) timings
are very large compared to the Render time.
2010-09-21 19:11:40 +03:00
06b0d72efa
Change license from GPL to LGPL (version 2.1)
2010-08-13 07:24:57 -04:00
a11ec0c89f
Automated merge
2010-05-04 16:09:14 -07:00
bd08f19894
EXT-6921 - Windows Xp/Vista unified volume control
2010-04-27 09:41:33 -07:00
658ccc3e85
Re-insert backed out SLE checkin so we can fix it
2010-04-07 11:08:04 -07:00
0bb3f144c0
Backed out changeset 63b699f90efd
2010-04-07 10:37:07 +01:00
aa0a129b67
Automated Merge
2010-04-01 21:47:22 -07:00
fc49539b36
EXT-2959 : Full out camera functions from llagent to llagentcamera
...
First check-in; only compiles, nothing more.
2010-03-23 15:59:52 -04:00
32e8dbaf38
EXT-5079 : Make sure to initialize ambient audio properly when it is muted
...
Reviewed by Richard (actually it was his idea)
2010-02-17 17:28:08 -08:00
4a0f58bbc6
EXT-1399 - Turn off wind when not flying
...
reviewed by Angela
2010-01-25 15:43:25 -08:00
8dec87c2ec
EXT-1399 Restore some wind noise when standing still, but drop volume
...
Make wind volume configurable via setting AudioLevelWind, currently
set to 0.5. Changing this to 1.0 will restore the viewer 1.23 behavior
Reviewed with Leyla.
2009-12-30 16:47:25 -08:00
a2efe4bb41
automated merge
2010-02-26 19:18:15 -08:00
2d7697dfad
automated merge
2010-02-26 01:52:28 -08:00
91b89383a8
Only use avatar motion to compute wind noise, makes world less desolate on login
...
and when standing still.
Reviewed with Kelly
2009-11-17 12:02:44 -08:00
4a2ed8f6f7
Removed unused legacy pie menu sounds to speed up startup and save memory.
2009-11-17 10:34:41 -08:00
745845f799
svn merge -r 129841:129910 svn+ssh://svn.lindenlab.com/svn/linden/branches/moss/pluginapi_05-merge@129910
...
svn merge -r 129913:131718 svn+ssh://svn.lindenlab.com/svn/linden/branches/pluginapi/pluginapi_05
Some branch shenannigans in the pluginapi_05 branch caused this to become a two-part merge.
2009-08-27 19:00:18 +00:00
ff52ac089f
DEV-34822 viewer 1.23 merge
...
DEV-32649 Merge the diamondware/vivox voice code
-r124876
-r125220
2009-07-15 21:50:42 +00:00
e3cf284388
Result of svn merge -r107256:107258 svn+ssh://svn/svn/user/phoenix/license_2009_merge into trunk. QAR-1165
2009-01-08 00:05:06 +00:00
fd46865a50
QAR-1040 maint-viewer-11 + OpenAL combo mergeme
...
svn merge -c104451
svn+ssh://svn.lindenlab.com/svn/linden/branches/moss/openal-maint-viewer-11-combo-r104448
2008-12-02 20:35:40 +00:00
afe61eb994
QAR-849 merge maint-viewer-10-merge 96838-97237 -> release
2008-09-23 01:53:11 +00:00
d85247e63e
QAR-449 Viewer 1.20 RC 0
...
merge Branch_1-20-Viewer -r 84060 : 84432 -> release
2008-04-17 02:42:27 +00:00
941cb9f412
merge release@83343 skinning-1-merge@83714 -> release
...
QAR-424
2008-04-01 17:45:04 +00:00
e3b97ac65b
merge release@82383 viewer-cleanup2-7-merge@82828
...
QAR-369
2008-03-20 21:41:26 +00:00
672a76d0ea
reverting premature commit at 82410.
2008-03-15 01:18:27 +00:00
04611efae8
[NOTE: This was an erroneous commit, and was reverted in the next revision]
...
QAR-369 - viewer-cleanup2-7 81916 merged into release.
2008-03-14 23:21:38 +00:00
98fd90ddd6
svn merge -r 79730:79944 svn+ssh://svn.lindenlab.com/svn/linden/branches/parcel_media/sl-parcelmedia-6 --> release
...
QAR-275 Parcel Media
Sam made me do it.
2008-02-14 01:45:59 +00:00
711b9749a1
DEV-9328 DEV-9330 DEV-9334 Fixed license information in source files to match the wiki [[License Substition]] standard. Commit to release OK by Josh/Jwolk.
2008-01-24 20:26:50 +00:00
df4d167cd1
svn merge -r74200:76302 svn+ssh://svn.lindenlab.com/svn/linden/branches/Branch_1-18-6-Viewer --> release
...
Wheee, this was fun. Um, let's back-port fixes a little more rapidly next time. Reviewed by CG until alexandria died, did the rest by my lonesome.
2007-12-21 06:44:41 +00:00
7dd08303a3
svn merge -r 75354:76103 svn+ssh://svn.lindenlab.com/svn/linden/branches/voice-group-moderation-3 -> release. Finished product of QAR-134
2007-12-19 00:56:59 +00:00
050dad0ce3
merge svn+ssh://steve@svn/svn/linden/branches/viewer-cleanup-3 -r 73026:73079
2007-11-07 22:55:27 +00:00
Oz Linden