Commit Graph

16 Commits (22a851663cddecced21acd88ed8ae4fa9fc733fd)

Author SHA1 Message Date
Nat Goodspeed 8cbc54d519 Automated merge with http://hg.secondlife.com/viewer-development 2011-12-01 16:53:28 -05:00
Nat Goodspeed 95fb0249e9 LLSD-14: Move LLSD::(outstanding|allocation)Count() to free functions.
Free functions can be unconditionally compiled into the .o file, but
conditionally hidden in the header file. Static class methods don't have that
flexibility: without a declaration in the header file, you can't compile a
function definition in the .cpp file. That makes it awkward to use the same
llcommon build for production and for unit tests.
Why make the function declarations conditional at all? These are debugging
functions. They break the abstraction, they peek under the covers. Production
code should not use them. Making them conditional on an #ifdef symbol in the
unit-test source file means the compiler would reject any use by production
code. Put differently, it allows us to assert with confidence that only unit
tests do use them.
Put new free functions in (lowercase) llsd namespace so as not to clutter
global namespace.
Tweak the one known consumer (llsd_new_tut.cpp) accordingly.
2011-12-01 16:50:27 -05:00
Nat Goodspeed b0d869554b LLSD-14: Add tests from Simon's server-trunk changeset 3852648182db.
That changeset provides most of the changes previously checked in on this Jira
(viewer changeset 22b293aae639). Bring over the code he added to
llsd_new_tut.cpp as well.
2011-11-17 11:10:39 -05:00
Logan Dethrow d1ccfc5495 Changed the handling of the different naming of fpclassify on windows and Linux in llsd_new_tut.cpp to be more clean at Nat's recommendation. 2011-10-05 15:33:53 -04:00
Logan Dethrow 8a289a161d Re-enabled and fixed llsd_new_tut.cpp by copying the fixed version from the server test directory. 2011-09-09 15:52:36 -04:00
Oz Linden 06b0d72efa Change license from GPL to LGPL (version 2.1) 2010-08-13 07:24:57 -04: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
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
Kartic Krishnamurthy b2bfb128e7 Merged into release with command:
=================================
svn merge -r100865:101402 svn+ssh://svn/svn/linden/branches/purge-dpo-code-for-merge .

QAR-951 : Sandbox QA for DEV 20842 - Ensure DPO is not enabled accidentally
QAR-967 : Merge Build for DEV 20842 - Ensure DPOis not enabled accidentally
QA tested: Beast, Oskar

DEV's fulfilled as part of this branch:
======================================

DEV-20842 Prevent accidental activation of DPO procs
DEV-23028 Mac build fails - link error dual inclusion
DEV-20824 VWR-9255: Build fails on mac_updater and mac_crash_logger targets due to info.plist problems
DEV-22997 Xcode project: 'server' target has no dependencies
DEV-23353 Friend request custom messages come through as an asset tag.
DEV-23309 Voice Chat Indicator does not show active voice status
DEV-23187 Can't teleport to home location
2008-11-07 00:07:44 +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
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
Aaron Brashears 4942a7b779 Result of svn merge -r70873:71086 svn+ssh://svn/svn/linden/branches/enable-exceptions into release. 2007-10-04 16:31:48 +00:00
Don Kjer 4ecb9cb63e svn merge -r 59163:61099 svn+ssh://svn/svn/linden/branches/release-candidate into release 2007-05-01 21:39:25 +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
Andrew Meadows bd48685d34 Fixed a linux build issue when the llhavok suddenly required rtti in order to link.
I added a #ifndef hack to v3math.h to eliminate LLString's from the llhavok project.
I also removed lluuid.h's dependency on LLString (using std::string) instead and
then fixed a bunch of bad dependency fallout on a few files around the project
that suddenly lost their hidden access to some fundamental includes.
The important parts were reviewed with James.
2007-02-07 20:33:52 +00:00
James Cook 420b91db29 Print done when done. 2007-01-02 08:33:20 +00:00