diff options
| author | Nat Goodspeed <nat@lindenlab.com> | 2016-09-01 15:22:34 -0400 |
|---|---|---|
| committer | Nat Goodspeed <nat@lindenlab.com> | 2016-09-01 15:22:34 -0400 |
| commit | 7203162071163108cbbb18f90ddb7f5d6734f8bd (patch) | |
| tree | 698966629d29e71f77777c75331aeac272e0371a /indra/llcommon/lluuid.cpp | |
| parent | 31d3d654f156351e3cf29f97fd97cbda046ae650 (diff) | |
| parent | 1bbc523b048628630e0a45f67f15cdf39cb138d9 (diff) | |
Automated merge with file:///Users/nat/linden/viewer-comment-lllog
Diffstat (limited to 'indra/llcommon/lluuid.cpp')
| -rw-r--r-- | indra/llcommon/lluuid.cpp | 2 |
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; |