diff options
Diffstat (limited to '')
-rw-r--r-- | linden/indra/llcommon/llsd.h | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/linden/indra/llcommon/llsd.h b/linden/indra/llcommon/llsd.h index 3f53735..98a6692 100644 --- a/linden/indra/llcommon/llsd.h +++ b/linden/indra/llcommon/llsd.h | |||
@@ -40,7 +40,7 @@ | |||
40 | 40 | ||
41 | #include "lldate.h" | 41 | #include "lldate.h" |
42 | #include "lluri.h" | 42 | #include "lluri.h" |
43 | #include "../llmath/lluuid.h" | 43 | #include "lluuid.h" |
44 | 44 | ||
45 | /** | 45 | /** |
46 | LLSD provides a flexible data system similar to the data facilities of | 46 | LLSD provides a flexible data system similar to the data facilities of |
@@ -394,7 +394,7 @@ std::ostream& operator<<(std::ostream& s, const LLSD& llsd); | |||
394 | - as UTF8 encoded strings (making not like UUID<->String) | 394 | - as UTF8 encoded strings (making not like UUID<->String) |
395 | - as Base64 or Base96 encoded (making like UUID<->String) | 395 | - as Base64 or Base96 encoded (making like UUID<->String) |
396 | - Conversions to std::string and LLUUID do not result in easy assignment | 396 | - Conversions to std::string and LLUUID do not result in easy assignment |
397 | to std::string, LLString or LLUUID due to non-unique conversion paths | 397 | to std::string, std::string or LLUUID due to non-unique conversion paths |
398 | */ | 398 | */ |
399 | 399 | ||
400 | #endif // LL_LLSD_NEW_H | 400 | #endif // LL_LLSD_NEW_H |