diff options
author | brad kittenbrink <brad@lindenlab.com> | 2009-08-27 16:25:02 -0400 |
---|---|---|
committer | brad kittenbrink <brad@lindenlab.com> | 2009-08-27 16:25:02 -0400 |
commit | d020dae7b9c156a08d1dd17eade7f36011f4d0fe (patch) | |
tree | 67b1a28222116b20c5fa7bcc1cbd86ca47a91aa7 /indra/llcommon/llsd.h | |
parent | 745845f79987e4b4ab7f5728746a0eda8898930f (diff) | |
parent | 70600ea66adc816e72e91e804deebde40ed6b1bc (diff) |
Merged latest login-api with latest viewer-2.0.0-3 up through plugin-api-05 merge (r131929).
Some minor post-merge cleanups still required.
Diffstat (limited to 'indra/llcommon/llsd.h')
-rw-r--r-- | indra/llcommon/llsd.h | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/indra/llcommon/llsd.h b/indra/llcommon/llsd.h index d2845a3757..552bb57498 100644 --- a/indra/llcommon/llsd.h +++ b/indra/llcommon/llsd.h @@ -89,7 +89,7 @@ @nosubgrouping */ -class LLSD +class LL_COMMON_API LLSD { public: LLSD(); ///< initially Undefined @@ -387,7 +387,7 @@ struct llsd_select_string : public std::unary_function<LLSD, LLSD::String> } }; -std::ostream& operator<<(std::ostream& s, const LLSD& llsd); +LL_COMMON_API std::ostream& operator<<(std::ostream& s, const LLSD& llsd); /** QUESTIONS & TO DOS - Would Binary be more convenient as usigned char* buffer semantics? |