Nat Goodspeed
ae0b3149ba
DRTVWR-418: Fix a round of compile errors surfaced by -std=c++11.
...
These are mostly things that were in fact erroneous, but accepted by older
compilers.
This changeset has not yet been built with Visual Studio 2013 or Linux gcc,
even with -std=c++11.
This changeset has not been built *without* -std=c++11. It should be used in
conjunction with a corresponding change to LL_BUILD_DARWIN_BASE_SWITCHES in
viewer-build-variables/variables.
This is a work in progress. We do not assert that this changeset completes the
work needed to turn on -std=c++11, even on the Mac.
2017-02-23 16:49:49 -05:00
Oz Linden
c8726aba30
remove execute permission from many files that should not have it
2015-11-10 09:48:56 -05:00
Richard Linden
0a96b47663
merge with viewer-release
2013-06-05 19:05:43 -07:00
Graham Madarasz
bf6182daa8
Update Mac and Windows breakpad builds to latest
2013-03-29 07:50:08 -07:00
Richard Linden
0bb0bd514b
SH-3499 WIP Ensure asset stats output is correct
...
Finished making LLUnit implicitly convertible to/from scalar integer values
cleaned up test code
2012-11-08 23:42:18 -08:00
Richard Linden
ed17c181dd
SH-3499 WIP Ensure asset stats output is correct
...
further fixes to implicit conversion of unit types
2012-11-07 15:32:12 -08:00
Todd Stinson
2f4ad07633
Cleaning up miscellaneous differences between the pathfinding repository and the latest viewer-development.
2012-03-20 17:38:58 -07:00
prep
378c076d1d
WIP: navmesh station posts to a url, responder receives llsd and then has the llpathing library extract and render the navmesh (if desired).
2011-11-17 13:32:04 -05:00
Oz Linden
a5619d16f7
correct licenses (fix problem with license change merge)
2010-10-13 07:24:37 -04:00
Dave Parks
2fea1d5d33
Integrate SIMD API from oreh/server-trunk-oreh
2010-08-19 12:25:15 -05:00
Dave Parks
237f1a1ba3
Consolidate now preserves materials.
2010-02-19 12:41:08 -06:00
Steven Bennetts
ade6bbb06c
merge -r 124105-124625 skinning-13 -> viewer-2.0.0-3
2009-06-21 17:16:27 +00:00
Steven Bennetts
9ec432034d
merge -r 122421-124917 viewer-2.0.0-2 -> viewer-2.0.0-3
...
ignore-dead-branch
2009-06-21 08:04:56 +00:00
Aaron Brashears
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
Andrew Meadows
222bca24c1
svn merge -r95288:95907 svn+ssh://svn.lindenlab.com/svn/linden/qa/maint-server/qar-841
...
this is a combined mergeback of the following branches as per QAR-841:
maint-server/maint-server-1 (absorbed by maint-server-2)
maint-server/maint-server-2
maint-server/maint-server-3
havok4/havok4-8
havok4/havok4-9
yes dataserver-is-deprecated
2008-09-05 22:03:35 +00:00
Steven Bennetts
25c10ed028
QAR-628 merge string-cleanup-5 -r 90476:90508 -> release
...
dataserver-is-deprecated
2008-06-26 00:39:00 +00:00
Brad Kittenbrink
6d52efe452
Merge of windlight into release (QAR-286). This includes all changes in
...
windlight14 which have passed QA (up through r79932).
svn merge -r 80831:80833 svn+ssh://svn.lindenlab.com/svn/linden/branches/merge_windlight14_r80620
2008-02-27 18:58:14 +00:00
Jon Wolk
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
Aaron Brashears
5595a99623
Result of svn merge -r71162:71205 svn+ssh://svn/svn/linden/branches/new-license into release. only changes files which are not deployed or the comments section of code.
2007-10-04 23:19:43 +00:00
Don Kjer
e5124431b5
svn merge -r 64079:64548 svn+ssh://svn/svn/linden/branches/maintenance into release
2007-07-02 17:10:30 +00:00
Richard Nelson
2ce0fc5f18
svn merge -r 59234:60086 svn+ssh://svn/svn/linden/branches/live_lsl_help2 -> release
2007-04-05 00:59:55 +00:00
James Cook
420b91db29
Print done when done.
2007-01-02 08:33:20 +00:00