diff options
| author | Richard Linden <none@none> | 2013-02-27 11:19:17 -0800 |
|---|---|---|
| committer | Richard Linden <none@none> | 2013-02-27 11:19:17 -0800 |
| commit | 83eda3f1524a08fa6fc4fbd836c92ae95e8100bc (patch) | |
| tree | b7317c3ba90269fa0136e46f260223bd04210678 /indra/newview/llviewerinventory.h | |
| parent | df3f6f6cacd3803748af569ad76ae1131ad1b1b9 (diff) | |
| parent | 756ab4cad5908f30c29a9e86f6905745dbec616c (diff) | |
Automated merge with https://bitbucket.org/lindenlab/sunshine-internal
Diffstat (limited to 'indra/newview/llviewerinventory.h')
| -rwxr-xr-x | indra/newview/llviewerinventory.h | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/indra/newview/llviewerinventory.h b/indra/newview/llviewerinventory.h index 812b3b2739..6fb0fd0153 100755 --- a/indra/newview/llviewerinventory.h +++ b/indra/newview/llviewerinventory.h @@ -211,7 +211,7 @@ public: // Returns true if a fetch was issued. bool fetch(); - // used to help make cacheing more robust - for example, if + // used to help make caching more robust - for example, if // someone is getting 4 packets but logs out after 3. the viewer // may never know the cache is wrong. enum { DESCENDENT_COUNT_UNKNOWN = -1 }; @@ -219,7 +219,7 @@ public: void setDescendentCount(S32 descendents) { mDescendentCount = descendents; } // file handling on the viewer. These are not meant for anything - // other than cacheing. + // other than caching. bool exportFileLocal(LLFILE* fp) const; bool importFileLocal(LLFILE* fp); void determineFolderType(); |