summaryrefslogtreecommitdiff
path: root/indra/llcommon/lluuid.cpp
diff options
context:
space:
mode:
authorNat Goodspeed <nat@lindenlab.com>2016-08-29 17:06:12 -0400
committerNat Goodspeed <nat@lindenlab.com>2016-08-29 17:06:12 -0400
commit6b24122857583537495a01f408c6c303f93adb02 (patch)
tree382a25e202c5fd171dcb01fb3e82bbb12781540e /indra/llcommon/lluuid.cpp
parent3d9c39c77cd4e4e8da8abf9234f1c751762985e6 (diff)
parent20cf275d21c0dce569bb3a16393b529c5c9f1c6c (diff)
Automated merge with ssh://bitbucket.org/lindenlab/viewer-vlc
Diffstat (limited to 'indra/llcommon/lluuid.cpp')
-rw-r--r--indra/llcommon/lluuid.cpp2
1 files changed, 1 insertions, 1 deletions
diff --git a/indra/llcommon/lluuid.cpp b/indra/llcommon/lluuid.cpp
index e3671047b4..d4af2c6b01 100644
--- a/indra/llcommon/lluuid.cpp
+++ b/indra/llcommon/lluuid.cpp
@@ -83,7 +83,7 @@ unsigned int decode( char const * fiveChars ) throw( bad_input_data )
unsigned int ret = 0;
for( int ix = 0; ix < 5; ++ix ) {
char * s = strchr( encodeTable, fiveChars[ ix ] );
-if( s == 0 ) throw bad_input_data();
+if( s == 0 ) LLTHROW(bad_input_data());
ret = ret * 85 + (s-encodeTable);
}
return ret;