diff options
| author | Maxim Nikolenko <maximnproductengine@lindenlab.com> | 2020-10-26 19:49:45 +0000 |
|---|---|---|
| committer | Callum Linden <callum@lindenlab.com> | 2020-10-26 19:49:45 +0000 |
| commit | 1c94c929ea99f79b87b58097348e0364512da9ad (patch) | |
| tree | 461abf5b7c657d1c73df530ffcaa1fd9ca46bee8 /indra/newview | |
| parent | 1cdcc00319c87b9be6ed677e4b36b0b53a1acb3e (diff) | |
| parent | c66c426d6b5bfab3922471adf7402bee5d10f8ec (diff) | |
Merged in DRTVWR-519 (pull request #356)
SL-14148 remove redundant zeroing of the file
Approved-by: Callum Linden
Diffstat (limited to 'indra/newview')
| -rw-r--r-- | indra/newview/app_settings/settings.xml | 2 | ||||
| -rw-r--r-- | indra/newview/llmeshrepository.cpp | 15 |
2 files changed, 1 insertions, 16 deletions
diff --git a/indra/newview/app_settings/settings.xml b/indra/newview/app_settings/settings.xml index cb21adaebd..fc1437148a 100644 --- a/indra/newview/app_settings/settings.xml +++ b/indra/newview/app_settings/settings.xml @@ -1371,7 +1371,7 @@ <key>Type</key> <string>U32</string> <key>Value</key> - <integer>10</integer> + <integer>50</integer> </map> <key>DiskCacheDirName</key> <map> diff --git a/indra/newview/llmeshrepository.cpp b/indra/newview/llmeshrepository.cpp index 3183e6d8fd..bd4bebbf23 100644 --- a/indra/newview/llmeshrepository.cpp +++ b/indra/newview/llmeshrepository.cpp @@ -3247,21 +3247,6 @@ void LLMeshHeaderHandler::processData(LLCore::BufferArray * /* body */, S32 /* b ++LLMeshRepository::sCacheWrites; file.write(data, data_size); - - // zero out the rest of the file - U8 block[MESH_HEADER_SIZE]; - memset(block, 0, sizeof(block)); - - while (bytes-file.tell() > sizeof(block)) - { - file.write(block, sizeof(block)); - } - - S32 remaining = bytes-file.tell(); - if (remaining > 0) - { - file.write(block, remaining); - } } } else |