Commit Graph

9 Commits (cc2f19ebd084c309be77ff1e4c8ed4b001cbdb36)

Author SHA1 Message Date
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 5b2f960ceb Fixing tut related compile errors on etch:
(1) the LLLand class had to be forward declared in a cpp file that did not include llland.h
(2) ensure_equals(const char*, type, type) requires that type have an operator!=(type, type) defined.
(3) ensure_equals(const char*, type, type) is so overloaded that the compiler can have trouble picking the right version when it has to implicitly cast a std::string to "const char*" AND multiple valid casts exist for type --> S32, F32, etc.  To solve this problem we must explicitly pass in a "const char*" instead of a std::string.
Reviewed with CG
2008-12-19 22:33:29 +00:00
Aaron Brashears 0a5c9731fd Result of svn merge -r105061:106057 svn+ssh://svn/svn/user/phoenix/upgrade-tut into trunk. QAR-1074 2008-12-18 01:30:09 +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 b69bf6e1f9 svn merge -r 61367:61368 svn+ssh://svn/svn/linden/branches/maintenance into release -- porting test spam removal 2007-05-07 19:17:30 +00:00
Don Kjer 70aaa3e444 svn merge -r 61148:61343 svn+ssh://svn/svn/linden/branches/maintenance into release 2007-05-04 21:57:06 +00:00
Aaron Brashears 5cc44523f7 Result of svn merge -r57350:57790 svn+ssh://svn/svn/linden/branches/os-patches.001 into release. 2007-02-09 23:35:12 +00:00
Mark Lentczner d0d4670f49 merge in of error-refactor-3
concludes (fixes) SL-31187
pair programmed and reviewed by markl and karen
2007-02-06 00:57:33 +00:00
James Cook 420b91db29 Print done when done. 2007-01-02 08:33:20 +00:00