diff options
| author | Richard Linden <none@none> | 2012-01-17 12:05:23 -0800 |
|---|---|---|
| committer | Richard Linden <none@none> | 2012-01-17 12:05:23 -0800 |
| commit | 37593f276cacb9db7f1f8ed8ff6c1fe1b56ff883 (patch) | |
| tree | 2ec32a4cf984cde8a003f45b324de328f318c675 /indra/newview/llavatariconctrl.cpp | |
| parent | 944814941d16e7853ff365acc17a16b3a20ac9cb (diff) | |
| parent | facb0fa42cf7dbc4deb3a4026cc216aa0099111e (diff) | |
Automated merge with ssh://hg.lindenlab.com/richard/viewer-experience/
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); |