diff options
author | Rider Linden <none@none> | 2015-04-13 09:37:09 -0700 |
---|---|---|
committer | Rider Linden <none@none> | 2015-04-13 09:37:09 -0700 |
commit | fe8dec32dbdd6085dd582c49134551638561ca0e (patch) | |
tree | 8adf11b88185879911fca64825e73b95ff9db972 /indra/llmessage/llavatarnamecache.h | |
parent | 2d3e4576d7a1f6d5f2a9c0596cefe3f62753b2fa (diff) | |
parent | 5c6cf3e7fb9f592e3a293921175b64b515bac23f (diff) |
Merge
Diffstat (limited to 'indra/llmessage/llavatarnamecache.h')
-rwxr-xr-x | indra/llmessage/llavatarnamecache.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/indra/llmessage/llavatarnamecache.h b/indra/llmessage/llavatarnamecache.h index 17b948f799..bd2715e956 100755 --- a/indra/llmessage/llavatarnamecache.h +++ b/indra/llmessage/llavatarnamecache.h @@ -45,7 +45,7 @@ namespace LLAvatarNameCache void cleanupClass(); // Import/export the name cache to file. - void importFile(std::istream& istr); + bool importFile(std::istream& istr); void exportFile(std::ostream& ostr); // On the viewer, usually a simulator capabilities. |