summaryrefslogtreecommitdiff
path: root/indra/llmessage/llsdmessagereader.cpp
diff options
context:
space:
mode:
authorOz Linden <oz@lindenlab.com>2011-12-13 10:23:22 -0500
committerOz Linden <oz@lindenlab.com>2011-12-13 10:23:22 -0500
commitd5f48181b50d9e941abafd76692359869e71a36d (patch)
tree66f2a744ca09c0ff483038ed639a5dd552cd5272 /indra/llmessage/llsdmessagereader.cpp
parent34b1982d33c83bb58c95bcedf36c9b5cd097584f (diff)
parentdbc91a7fac9513bdd879c5c2dc82208e08eaad2d (diff)
merge up to latest viewer-development
Diffstat (limited to 'indra/llmessage/llsdmessagereader.cpp')
-rw-r--r--indra/llmessage/llsdmessagereader.cpp3
1 files changed, 2 insertions, 1 deletions
diff --git a/indra/llmessage/llsdmessagereader.cpp b/indra/llmessage/llsdmessagereader.cpp
index 304a692cdf..3d8ca2ad9f 100644
--- a/indra/llmessage/llsdmessagereader.cpp
+++ b/indra/llmessage/llsdmessagereader.cpp
@@ -291,9 +291,10 @@ S32 getElementSize(const LLSD& llsd)
case LLSD::TypeMap:
case LLSD::TypeArray:
case LLSD::TypeUndefined:
+ default: // TypeLLSDTypeEnd, TypeLLSDNumTypes, etc.
return 0;
}
- return 0;
+ //return 0;
}
//virtual