diff options
author | Nat Goodspeed <nat@lindenlab.com> | 2014-11-14 08:49:08 -0500 |
---|---|---|
committer | Nat Goodspeed <nat@lindenlab.com> | 2014-11-14 08:49:08 -0500 |
commit | 6be2f0ba2b672fc37cd6d4e8adf62ae71bf8c842 (patch) | |
tree | 86740538c9c2a2ff1359cf96db2521d99c8aebe7 /indra/llcommon/llfile.h | |
parent | 2301cf800f40101baed7a5936683d0b1e4968be1 (diff) | |
parent | 316e35ad2a735784cfc309ea9fd74d2d9d1f985a (diff) |
Automated merge with ssh://bitbucket.org/lindenlab/viewer-release
Diffstat (limited to 'indra/llcommon/llfile.h')
-rwxr-xr-x | indra/llcommon/llfile.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/indra/llcommon/llfile.h b/indra/llcommon/llfile.h index f56b22bf9a..0612071d67 100755 --- a/indra/llcommon/llfile.h +++ b/indra/llcommon/llfile.h @@ -188,7 +188,7 @@ protected: /*virtual*/ int sync(); std::streamsize xsgetn(char_type*, std::streamsize); - std::streamsize xsputn(char_type*, std::streamsize); + std::streamsize xsputn(const char_type*, std::streamsize); #endif }; |