aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/linden/indra/llmessage/llxfer_vfile.cpp
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/llmessage/llxfer_vfile.cpp
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/llmessage/llxfer_vfile.cpp')
-rw-r--r--linden/indra/llmessage/llxfer_vfile.cpp10
1 files changed, 5 insertions, 5 deletions
diff --git a/linden/indra/llmessage/llxfer_vfile.cpp b/linden/indra/llmessage/llxfer_vfile.cpp
index 69d580a..aede763 100644
--- a/linden/indra/llmessage/llxfer_vfile.cpp
+++ b/linden/indra/llmessage/llxfer_vfile.cpp
@@ -74,10 +74,10 @@ void LLXfer_VFile::init (LLVFS *vfs, const LLUUID &local_id, LLAssetType::EType
74 74
75 mVFile = NULL; 75 mVFile = NULL;
76 76
77 char id_string[UUID_STR_LENGTH]; /* Flawfinder : ignore */ 77 std::string id_string;
78 mLocalID.toString(id_string); 78 mLocalID.toString(id_string);
79 79
80 snprintf(mName, sizeof(mName), "VFile %s:%s", id_string, LLAssetType::lookup(mType)); /* Flawfinder : ignore */ 80 mName = llformat("VFile %s:%s", id_string.c_str(), LLAssetType::lookup(mType));
81} 81}
82 82
83/////////////////////////////////////////////////////////// 83///////////////////////////////////////////////////////////
@@ -118,10 +118,10 @@ S32 LLXfer_VFile::initializeRequest(U64 xfer_id,
118 mCallbackDataHandle = user_data; 118 mCallbackDataHandle = user_data;
119 mCallbackResult = LL_ERR_NOERR; 119 mCallbackResult = LL_ERR_NOERR;
120 120
121 char id_string[UUID_STR_LENGTH]; /* Flawfinder : ignore */ 121 std::string id_string;
122 mLocalID.toString(id_string); 122 mLocalID.toString(id_string);
123 123
124 snprintf(mName, sizeof(mName), "VFile %s:%s", id_string, LLAssetType::lookup(mType)); /* Flawfinder : ignore */ 124 mName = llformat("VFile %s:%s", id_string.c_str(), LLAssetType::lookup(mType));
125 125
126 llinfos << "Requesting " << mName << llendl; 126 llinfos << "Requesting " << mName << llendl;
127 127
@@ -328,7 +328,7 @@ BOOL LLXfer_VFile::matchesRemoteFile(const LLUUID &id, LLAssetType::EType type)
328 328
329////////////////////////////////////////////////////////// 329//////////////////////////////////////////////////////////
330 330
331const char * LLXfer_VFile::getName() 331std::string LLXfer_VFile::getFileName()
332{ 332{
333 return mName; 333 return mName;
334} 334}