diff options
| author | Nat Goodspeed <nat@lindenlab.com> | 2012-02-27 11:51:57 -0500 |
|---|---|---|
| committer | Nat Goodspeed <nat@lindenlab.com> | 2012-02-27 11:51:57 -0500 |
| commit | e7ab3da7a7f5c68e3544a64c30f011762572995a (patch) | |
| tree | 65a8aab420f23e7b53c72c7326a26a6c4901489f /indra/newview/llavatariconctrl.cpp | |
| parent | c0318d1bf988217e1fbb0593d03c4f0235a13ea3 (diff) | |
| parent | 4a7848148e886676dd24bfcf4f50db06bffb28da (diff) | |
Automated merge with file:///Users/nat/linden/viewer-leap-daggy
Diffstat (limited to 'indra/newview/llavatariconctrl.cpp')
| -rwxr-xr-x[-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..100755 --- 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); |