diff options
| author | Josh Bell <josh@lindenlab.com> | 2008-02-13 01:02:09 +0000 |
|---|---|---|
| committer | Josh Bell <josh@lindenlab.com> | 2008-02-13 01:02:09 +0000 |
| commit | 54e428d2094267d993fd51dc1d879106083d3db5 (patch) | |
| tree | e9586f1c2fffbdaba897fa43f6d5ead18ae6f0df /indra/llmessage/llcachename.h | |
| parent | eb55ba3c7f51fa47336bead33077c298cec33b65 (diff) | |
svn merge -r 79828:79862 svn+ssh://svn.lindenlab.com/svn/linden/qa/combo-merge-2008-02-12 --> release
QAR-280 - combo merge of:
* QAR-249 Allow specifying max http protocol version in eventlet.httpd, and change backbone.py to specify HTTP/1.0 explicitly
* QAR-272 Switch logout/disconnect messages to syslog/streambase
* QAR-253 Test for the group names fix
* QAR-260 metrics-3 for release merge
Diffstat (limited to 'indra/llmessage/llcachename.h')
| -rw-r--r-- | indra/llmessage/llcachename.h | 8 |
1 files changed, 6 insertions, 2 deletions
diff --git a/indra/llmessage/llcachename.h b/indra/llmessage/llcachename.h index ab6282966d..4eae6365bc 100644 --- a/indra/llmessage/llcachename.h +++ b/indra/llmessage/llcachename.h @@ -63,9 +63,12 @@ public: void cancelCallback(const LLUUID& id, LLCacheNameCallback callback, void* user_data = NULL); - // storing cache on disk; for viewer, in name.cache + // janky old format. Remove after a while. Phoenix. 2008-01-30 void importFile(FILE* fp); - void exportFile(FILE* fp); + + // storing cache on disk; for viewer, in name.cache + bool importFile(std::istream& istr); + void exportFile(std::ostream& ostr); // If available, copies the first and last name into the strings provided. // first must be at least DB_FIRST_NAME_BUF_SIZE characters. @@ -104,6 +107,7 @@ public: static LLString getDefaultName(); private: + class Impl; Impl& impl; }; |