diff options
| author | prep <prep@lindenlab.com> | 2012-01-19 14:39:06 -0500 |
|---|---|---|
| committer | prep <prep@lindenlab.com> | 2012-01-19 14:39:06 -0500 |
| commit | dc6b871db8e5e5247d8ef88150efb18186b5e6c8 (patch) | |
| tree | 65a14a4731b74a8c22c11142b46ecb1a48a448b5 /indra/newview/llavatariconctrl.cpp | |
| parent | e2ef5a5edce6a01724d91fde5b471b0bae18d045 (diff) | |
| parent | 146f0c25504cc16458cb20312eba63b04d26389d (diff) | |
merge
Diffstat (limited to 'indra/newview/llavatariconctrl.cpp')
| -rw-r--r-- | indra/newview/llavatariconctrl.cpp | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/indra/newview/llavatariconctrl.cpp b/indra/newview/llavatariconctrl.cpp index 42e7decec1..b539ac38ed 100644 --- a/indra/newview/llavatariconctrl.cpp +++ b/indra/newview/llavatariconctrl.cpp @@ -75,6 +75,9 @@ void LLAvatarIconIDCache::load () LLUUID icon_id; LLDate date; + if (line.length()<=uuid_len*2) + continue; // short line, bail out to prevent substr calls throwing exception. + std::string avatar_id_str = line.substr(0,uuid_len); std::string icon_id_str = line.substr(uuid_len,uuid_len); |