diff options
| author | Kitty Barnett <develop@catznip.com> | 2012-01-23 19:43:14 +0100 |
|---|---|---|
| committer | Kitty Barnett <develop@catznip.com> | 2012-01-23 19:43:14 +0100 |
| commit | 7b3bc9b58702940c039db620642c005e054040ed (patch) | |
| tree | f8be20d7d49f7538e3f4daf4564410768c7007b7 /indra/newview/llavatariconctrl.cpp | |
| parent | b81bf4f6f182e6345889d70140b34b15cbfb8d27 (diff) | |
| parent | 64c45cbd1ace677456db56d1a506f2fe44b6e9c6 (diff) | |
Merge with viewer-development
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); |