7cc408a5cd
Merge.
2018-04-10 12:33:45 +02:00
ef20e3f523
Replace ARP Mutex and Condition with std::mutx and std::conditional_variable
2018-04-05 12:02:12 +02:00
d7a0835432
Merge.
2016-09-26 21:12:34 +02:00
5e9d2f57c8
MAINT-5011: Use LLTHROW() instead of plain BOOST_THROW_EXCEPTION().
...
A level of preprocessor indirection lets us later change the implementation if
desired.
2016-08-17 11:36:24 -04:00
9c49a6c91d
MAINT-5011: Introduce LLException base class for viewer exceptions.
...
This also introduces LLContinueError for exceptions which should interrupt
some part of viewer processing (e.g. the current coroutine) but should attempt
to let the viewer session proceed.
Derive all existing viewer exception classes from LLException rather than from
std::runtime_error or std::logic_error.
Use BOOST_THROW_EXCEPTION() rather than plain 'throw' to enrich the thrown
exception with source file, line number and containing function.
2016-07-19 16:25:25 -04:00
3192fe832f
Merge viewer-quickgraphics
2016-03-08 01:41:31 +01:00
c8726aba30
remove execute permission from many files that should not have it
2015-11-10 09:48:56 -05:00
6197835813
Fix attribution for c3f57eb1a922 which was originally done by Drake Arconis (Sovereign Engineer) / Shyotl Kuhr
2014-08-29 08:37:35 +02:00
9a679a27ac
Fix for misaligned unsigned ints in LLUUID; by Cinder Roxley
2014-08-26 21:47:04 +02:00
e340009fc5
second phase summer cleaning
...
replace llinfos, lldebugs, etc with new LL_INFOS(), LL_DEBUGS(), etc.
2013-08-09 17:11:19 -07:00
0a96b47663
merge with viewer-release
2013-06-05 19:05:43 -07:00
bf6182daa8
Update Mac and Windows breakpad builds to latest
2013-03-29 07:50:08 -07:00
0d8f1077a6
Automated merge with http://bitbucket.org/lindenlab/viewer-development
2013-01-04 16:46:25 -08:00
5c334bdc5b
MAINT-1986: patch OPSDEV-111 fix (rev 9346b73d6843) from server-trunk
2012-12-18 16:09:31 -05:00
f08c5d95ac
MAINT-1986: patch DEV-50942 fix (rev 28828ba0f0be) from server-trunk.
2012-12-18 14:20:06 -05:00
9d77e030d9
SH-3406 WIP convert fast timers to lltrace system
...
cleaning up build
moved most includes of windows.h to llwin32headers.h to disable min/max macros, etc
streamlined Time class and consolidated functionality in BlockTimer class
llfasttimer is no longer included via llstring.h, so had to add it manually in several places
2012-11-14 23:52:27 -08:00
ef75a2e07e
WIP:Displaying physics capsule for a character - it is currently disabled.
2012-05-31 16:38:19 -04:00
06b0d72efa
Change license from GPL to LGPL (version 2.1)
2010-08-13 07:24:57 -04:00
87082996e6
Revert to previous implementation of getNodeId.
2010-06-22 15:19:16 -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
66efd3f432
fix windows build break again
2010-03-02 14:29:42 -08:00
b11a625e6f
Automated merge with a few fixups for code review comments
2010-03-01 15:31:04 -08:00
ff51d31af3
remove windows line endings introduced via transplant
2010-02-05 17:38:26 -08:00
b90c7d648e
Use malloc in order to fix linking issue
2009-10-15 19:40:20 -07:00
73e86b0bed
MAC Address Change no longer causes viewer to die cr:Roxie
2009-10-15 16:52:03 -07:00
15a6d273cc
svn merge -r108142:108148 svn+ssh://svn.lindenlab.com/svn/linden/qa/maint-server/maint-server-5-r108113
2009-01-17 01:29:45 +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
667ca55bad
svn merge -r106715:HEAD svn+ssh://svn.lindenlab.com/svn/linden/branches/q/notifications-merge-r106715 . QAR-1149 -- Final merge of notifications to trunk.
2009-01-05 18:59:12 +00:00
ae464867e6
svn merge -r 90938:92097 svn+ssh://svn.lindenlab.com/svn/linden/branches/qar-730/qar-730-merge -> release. This is for QAR-730: Combination merge of QAR-432 and QAR-601
2008-07-15 00:41:08 +00:00
25c10ed028
QAR-628 merge string-cleanup-5 -r 90476:90508 -> release
...
dataserver-is-deprecated
2008-06-26 00:39:00 +00:00
9db949eec3
svn merge -r88066:88786 svn+ssh://svn.lindenlab.com/svn/linden/branches/cmake-9-merge
...
dataserver-is-deprecated
for-fucks-sake-whats-with-these-commit-markers
2008-06-02 21:14:31 +00:00
Nicky