summaryrefslogtreecommitdiff
path: root/indra/llmessage/llavatarnamecache.h
diff options
context:
space:
mode:
authorNorthspring <pantera.polnocy@phoenixviewer.com>2015-04-23 22:43:05 +0200
committerNorthspring <pantera.polnocy@phoenixviewer.com>2015-04-23 22:43:05 +0200
commit942d72ec36aa0e8be1d1aac35ab679463741b2d1 (patch)
tree02f84efaf0effaccc11e48c161a45f6693ec61c5 /indra/llmessage/llavatarnamecache.h
parent2eb07a7080a85e9a63a6f5aff49907b386b865d2 (diff)
parentfde0868231a25b8c9ce03a86cb53f1738d35688d (diff)
Merge
Diffstat (limited to 'indra/llmessage/llavatarnamecache.h')
-rwxr-xr-xindra/llmessage/llavatarnamecache.h2
1 files changed, 1 insertions, 1 deletions
diff --git a/indra/llmessage/llavatarnamecache.h b/indra/llmessage/llavatarnamecache.h
index ea016b3125..5a10053a69 100755
--- a/indra/llmessage/llavatarnamecache.h
+++ b/indra/llmessage/llavatarnamecache.h
@@ -46,7 +46,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 capabilitity.