diff options
| author | Dave Parks <davep@lindenlab.com> | 2013-01-09 12:41:57 -0600 |
|---|---|---|
| committer | Dave Parks <davep@lindenlab.com> | 2013-01-09 12:41:57 -0600 |
| commit | 971e9bd203802420abcfa60d9303d89570900e3d (patch) | |
| tree | c37131a436f720d1128cdd97b084367d96a66c4b | |
| parent | dda41e3458702bcd7e4d671613982ff2273a94f1 (diff) | |
More merge cleanup.
| -rw-r--r-- | indra/newview/llmeshrepository.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/indra/newview/llmeshrepository.h b/indra/newview/llmeshrepository.h index 4625d8edef..8602271f84 100644 --- a/indra/newview/llmeshrepository.h +++ b/indra/newview/llmeshrepository.h @@ -411,7 +411,7 @@ public: LLHandle<LLWholeModelFeeObserver> fee_observer= (LLHandle<LLWholeModelFeeObserver>()), LLHandle<LLWholeModelUploadObserver> upload_observer = (LLHandle<LLWholeModelUploadObserver>())); ~LLMeshUploadThread(); - void startRequest(); { ++mPendingUploads; } + void startRequest() { ++mPendingUploads; } void stopRequest() { --mPendingUploads; } bool finished() { return mFinished; } |