Lirusaito
15af410e6f
Fix typo in outbox icon name, when closed.
2012-07-19 14:02:11 -04:00
Aleric Inglewood
9e5cbf330f
Bug fix for windows code found with previous commit.
2012-07-19 17:28:45 +02:00
Aleric Inglewood
2fa9334090
Debug code to test the windows code path on linux
2012-07-19 17:27:37 +02:00
Aleric Inglewood
fcdf5d377e
Move PollSet out of the header file
2012-07-19 17:26:02 +02:00
Shyotl
756a284048
Don't ever halt stalled fmodex streams, as they don't seem to truly 'stall'. Decrease delay between leaving starvation and unmuting down to 1 second (from 5).
2012-07-19 02:32:16 -05:00
Lirusaito
32e2b584b9
Translation Fix
2012-07-19 02:12:51 -04:00
Lirusaito
add52b4d57
Merge branch 'master' of https://github.com/singularity-viewer/SingularityViewer
2012-07-18 23:41:23 -04:00
Siana Gearz
a4d2cb3d12
Some fighting with Shyotl over FMOD Ex
2012-07-19 05:35:17 +02:00
Lirusaito
72fbb3f63e
Merge branch 'master' of https://github.com/DamianZhaoying/SingularityViewer
2012-07-18 22:58:52 -04:00
Siana Gearz
c62290accb
Merge branch 'master' of git://github.com/Lirusaito/SingularityViewer
2012-07-19 04:46:15 +02:00
Siana Gearz
8ad40c5d66
Merge branch 'master' of git://github.com/Shyotl/SingularityViewer
...
Conflicts:
indra/llaudio/llaudioengine_fmodex.cpp
2012-07-19 04:44:01 +02:00
Lirusaito
cd5a721c23
Merge branch 'master' of git://github.com/Shyotl/SingularityViewer
2012-07-18 22:31:53 -04:00
Shyotl
643844c01d
GCC being GCC-ey. Fix a couple errors and warnings
2012-07-18 21:27:46 -05:00
Lirusaito
c84f080fc8
Merge branch 'master' of git://github.com/Shyotl/SingularityViewer
2012-07-18 22:08:06 -04:00
Shyotl
5fcdbfdd9e
FMODEx diagnostics.
...
SHFMODExStreamBufferSize added. Determines stream buffer size in ms. (stream restart required)
SHFMODExDecodeBufferSize added. Determines decode buffer size in ms. (stream restart required)
Streams will mute themselves if they are starving, until they are free of starvation for 5 full seconds.
Streams that fail to accumulate any buffer progress while starving for 10 full updates will be stopped.
Stream buffer progress(buffer percent) is llinfos spewed every update. (temporary)
Doubled default stream buffer size
Increased default decode buffer size to 1000ms (from 400)
Temporarily using FMOD::Memory_Initialize to display raw stream/decode buffer sizes via llinfos.
Added llwarns messages for SigmaTel hardware or bad audio acceleration configuration.
2012-07-18 21:05:24 -05:00
Siana Gearz
96fa4af939
Initialize FMOD Ex with 44100 Hz, like FMOD
2012-07-19 03:26:02 +02:00
Siana Gearz
2334793554
Build SLPLugin.exe without tcmalloc, for SkyDrive
2012-07-19 03:24:44 +02:00
Lirusaito
20e445b4be
Added icons for folders from phoenix, and created outbox folder icon for future use.
2012-07-18 20:26:19 -04:00
Aleric Inglewood
051263117d
Don't force TLS v1 unless needed and then warn about it.
2012-07-19 00:13:43 +02:00
Lirusaito
085db93fc8
menu_inventory.xml translations update.
...
Brought the French up to date, translations on my own..
Brought the Spanish up to standard.
2012-07-18 16:04:12 -04:00
Damian Zhaoying
8fe6925414
New Spanish Translations
2012-07-18 15:30:03 -03:00
Damian Zhaoying
57ad7e62d2
Merge remote-tracking branch 'upstream/master'
2012-07-18 08:57:45 -03:00
Lirusaito
03608103b8
Tiny French Translation update
...
~Thanks Nomade~
2012-07-18 03:57:07 -04:00
Damian Zhaoying
675d171104
Merge remote-tracking branch 'upstream/master'
2012-07-18 03:16:39 -03:00
Lirusaito
405af67f45
Merge branch 'AltCompilers'
2012-07-17 22:30:48 -04:00
Aleric Inglewood
f772cbee51
Don't crash upon exit if we fail to cleanup.
2012-07-18 03:13:33 +02:00
Shyotl
72d93b8723
Merge branch 'V2MultiWear'
2012-07-17 19:46:56 -05:00
Aleric Inglewood
7f78870295
Merge remote-tracking branch 'siana/master' into curlthreading2
...
Conflicts:
indra/llcommon/llstring.cpp
indra/llmessage/llcurl.cpp
indra/newview/llviewertexturelist.cpp
indra/newview/viewer_manifest.py
install.xml
Resolved:
indra/llcommon/llstring.cpp :
two different ways to work around compile error.
indra/llmessage/llcurl.cpp :
this file is no longer used.. I deleted huge
parts to mark that I implemented that. Siana
apparently made a few changes in those parts.
indra/newview/llviewertexturelist.cpp :
manually copied patch. Mine also removed trailing
spaces, keeping that.
indra/newview/viewer_manifest.py:
Collision with changes from Liru, which have been
ignored (kept siana/master).
install.xml:
Collision with an earlier screw up. I kept the
fix from siana/master.
2012-07-18 02:08:31 +02:00
Aleric Inglewood
706b9c55c2
Moving stuff around a bit...
2012-07-18 01:41:36 +02:00
Shyotl
48ae0d003d
Made the Visual Studio compiler a bit more happy with aicurl.
2012-07-17 18:04:48 -05:00
Damian Zhaoying
51c5933b76
Merge remote-tracking branch 'upstream/master'
2012-07-17 19:49:33 -03:00
Aleric Inglewood
0204d09a89
If curl thread is already awake, then don't write something to the pipe.
2012-07-17 23:39:44 +02:00
Lirusaito
465c6b9ed6
Bring back ASCENDED_DEVELOPER, and give it extra meaning!
2012-07-17 16:42:43 -04:00
Drake Arconis
39847c4688
Merge remote-tracking branch 'liruhub/master' into AltCompilers
2012-07-17 16:08:10 -04:00
Drake Arconis
7721c6e3da
Resolved issue with glibc 2.16
...
Resolved issues introduced by changes made in glibc 2.16 removing the undocumented definition of struct siginfo from bits/siginfo.h
2012-07-17 16:06:31 -04:00
Aleric Inglewood
648ed00ce2
Don't call gSavedSettings.getU32() and calc_clock_frequency() so often anymore.
2012-07-17 19:58:34 +02:00
Aleric Inglewood
87c9358813
Add back erroneously removed comments.
2012-07-17 19:33:12 +02:00
Aleric Inglewood
64b968b262
process is no longer processing
2012-07-17 19:27:14 +02:00
Lirusaito
c0fbf4bf55
Merge branch 'master' of https://github.com/DamianZhaoying/SingularityViewer
2012-07-17 12:17:32 -04:00
Aleric Inglewood
900e533b4b
Remove unused call to process().
2012-07-17 08:01:06 +02:00
Damian Zhaoying
01818582cf
Merge remote-tracking branch 'upstream/master'
2012-07-16 21:07:25 -03:00
Lirusaito
9a0620f140
Add Voodoo to tags.
2012-07-16 19:33:44 -04:00
Drake Arconis
0216925e05
Merge remote-tracking branch 'siana/master' into AltCompilers
2012-07-16 17:20:57 -04:00
Drake Arconis
32b24a98ca
Merge remote-tracking branch 'shyotl/V2MultiWear' into AltCompilers
2012-07-16 17:20:47 -04:00
Drake Arconis
93d7a4938a
Merge remote-tracking branch 'liru/master' into AltCompilers
2012-07-16 17:19:58 -04:00
Drake Arconis
56265b78ec
Merge remote-tracking branch 'liru/V2MultiWear' into AltCompilers
2012-07-16 17:19:45 -04:00
Lirusaito
6ee76aa6f7
Merge branch 'master' of git://github.com/siana/SingularityViewer
2012-07-16 17:11:44 -04:00
Lirusaito
32d6aefe00
Merge branch 'V2MultiWear' of git://github.com/Shyotl/SingularityViewer
2012-07-16 17:10:01 -04:00
Lirusaito
84795863e5
Translations updated
...
Updated French Translation from Nomade's Zip for MultiWear.
Updated Translations to use basically the same format, and not have some cruft.
Abouts updated to include Spanish translators: Damian Zhaoying, and Franxizco Romano.
2012-07-16 17:07:22 -04:00
Aleric Inglewood
9deb3e433c
LLCurlRequest time out fixes.
...
Also some more cleanup on exit improvements.
2012-07-16 22:35:04 +02:00