summaryrefslogtreecommitdiff
path: root/indra/llmessage
diff options
context:
space:
mode:
authorNat Goodspeed <nat@lindenlab.com>2011-11-17 08:06:31 -0500
committerNat Goodspeed <nat@lindenlab.com>2011-11-17 08:06:31 -0500
commitcc1fb7bcac2924674763d917f66d84fbadb11623 (patch)
tree4be6fb6742157246e9fdda0c9ca86947ec5c3268 /indra/llmessage
parent4bcdcd02fb7e83a2754084f2fb599b56ea6c8743 (diff)
LLSD-14: Bring over llsd.{h,cpp} enhancements from server-trunk.
Because new enum values have been added to the LLSD type field, a few external switch statements must be adjusted to suppress fatal warnings, even though we never expect to encounter an LLSD instance containing any of the new values.
Diffstat (limited to 'indra/llmessage')
-rw-r--r--indra/llmessage/llsdmessagereader.cpp1
1 files changed, 1 insertions, 0 deletions
diff --git a/indra/llmessage/llsdmessagereader.cpp b/indra/llmessage/llsdmessagereader.cpp
index 304a692cdf..3ab62a8c57 100644
--- a/indra/llmessage/llsdmessagereader.cpp
+++ b/indra/llmessage/llsdmessagereader.cpp
@@ -291,6 +291,7 @@ S32 getElementSize(const LLSD& llsd)
case LLSD::TypeMap:
case LLSD::TypeArray:
case LLSD::TypeUndefined:
+ default: // TypeLLSDTypeEnd, TypeLLSDNumTypes, etc.
return 0;
}
return 0;