aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/linden/indra/llvfs/lllfsthread.h
diff options
context:
space:
mode:
authorJacek Antonelli2008-09-06 18:24:57 -0500
committerJacek Antonelli2008-09-06 18:25:07 -0500
commit798d367d54a6c6379ad355bd8345fa40e31e7fe9 (patch)
tree1921f1708cd0240648c97bc02df2c2ab5f2fc41e /linden/indra/llvfs/lllfsthread.h
parentSecond Life viewer sources 1.20.15 (diff)
downloadmeta-impy-798d367d54a6c6379ad355bd8345fa40e31e7fe9.zip
meta-impy-798d367d54a6c6379ad355bd8345fa40e31e7fe9.tar.gz
meta-impy-798d367d54a6c6379ad355bd8345fa40e31e7fe9.tar.bz2
meta-impy-798d367d54a6c6379ad355bd8345fa40e31e7fe9.tar.xz
Second Life viewer sources 1.21.0-RC
Diffstat (limited to 'linden/indra/llvfs/lllfsthread.h')
-rw-r--r--linden/indra/llvfs/lllfsthread.h10
1 files changed, 5 insertions, 5 deletions
diff --git a/linden/indra/llvfs/lllfsthread.h b/linden/indra/llvfs/lllfsthread.h
index b073422..eebec48 100644
--- a/linden/indra/llvfs/lllfsthread.h
+++ b/linden/indra/llvfs/lllfsthread.h
@@ -75,7 +75,7 @@ public:
75 public: 75 public:
76 Request(LLLFSThread* thread, 76 Request(LLLFSThread* thread,
77 handle_t handle, U32 priority, 77 handle_t handle, U32 priority,
78 operation_t op, const LLString& filename, 78 operation_t op, const std::string& filename,
79 U8* buffer, S32 offset, S32 numbytes, 79 U8* buffer, S32 offset, S32 numbytes,
80 Responder* responder); 80 Responder* responder);
81 81
@@ -95,7 +95,7 @@ public:
95 { 95 {
96 return mBuffer; 96 return mBuffer;
97 } 97 }
98 const LLString& getFilename() 98 const std::string& getFilename()
99 { 99 {
100 return mFileName; 100 return mFileName;
101 } 101 }
@@ -108,7 +108,7 @@ public:
108 LLLFSThread* mThread; 108 LLLFSThread* mThread;
109 operation_t mOperation; 109 operation_t mOperation;
110 110
111 LLString mFileName; 111 std::string mFileName;
112 112
113 U8* mBuffer; // dest for reads, source for writes, new UUID for rename 113 U8* mBuffer; // dest for reads, source for writes, new UUID for rename
114 S32 mOffset; // offset into file, -1 = append (WRITE only) 114 S32 mOffset; // offset into file, -1 = append (WRITE only)
@@ -124,10 +124,10 @@ public:
124 ~LLLFSThread(); 124 ~LLLFSThread();
125 125
126 // Return a Request handle 126 // Return a Request handle
127 handle_t read(const LLString& filename, /* Flawfinder: ignore */ 127 handle_t read(const std::string& filename, /* Flawfinder: ignore */
128 U8* buffer, S32 offset, S32 numbytes, 128 U8* buffer, S32 offset, S32 numbytes,
129 Responder* responder, U32 pri=0); 129 Responder* responder, U32 pri=0);
130 handle_t write(const LLString& filename, 130 handle_t write(const std::string& filename,
131 U8* buffer, S32 offset, S32 numbytes, 131 U8* buffer, S32 offset, S32 numbytes,
132 Responder* responder, U32 pri=0); 132 Responder* responder, U32 pri=0);
133 133