summaryrefslogtreecommitdiff
path: root/indra/newview/llmeshrepository.cpp
diff options
context:
space:
mode:
authorGraham Linden <graham@lindenlab.com>2019-03-13 13:21:48 -0700
committerGraham Linden <graham@lindenlab.com>2019-03-13 13:21:48 -0700
commit898c9f44218353b3bf71b78ffce02662b4927625 (patch)
tree2793682ba7d69d34730a4aeced04100312a479a2 /indra/newview/llmeshrepository.cpp
parent868cd32e5e229e503f1b5b1d5ec543fd6f76cb7f (diff)
Mods to make merge with viewer-release have less whitespace-only change and fix diffs between EEP and VR.
Diffstat (limited to 'indra/newview/llmeshrepository.cpp')
-rw-r--r--indra/newview/llmeshrepository.cpp2
1 files changed, 1 insertions, 1 deletions
diff --git a/indra/newview/llmeshrepository.cpp b/indra/newview/llmeshrepository.cpp
index c934cd2980..e38bd8846d 100644
--- a/indra/newview/llmeshrepository.cpp
+++ b/indra/newview/llmeshrepository.cpp
@@ -2663,7 +2663,7 @@ void LLMeshUploadThread::requestWholeModelFee()
{
ms_sleep(sleep_time);
sleep_time = llmin(250U, sleep_time + sleep_time);
- mHttpRequest->update(0);
+ mHttpRequest->update(0);
}
if (isDiscarded())
{