diff options
| author | Dave Parks <davep@lindenlab.com> | 2013-01-09 12:08:31 -0600 |
|---|---|---|
| committer | Dave Parks <davep@lindenlab.com> | 2013-01-09 12:08:31 -0600 |
| commit | dda41e3458702bcd7e4d671613982ff2273a94f1 (patch) | |
| tree | b250ffa7fe5878f4235f9ec9c3ca1ceeb932aa12 | |
| parent | 954ebaed84f934437fc3a18c937f08fc527359e3 (diff) | |
Merge cleanup.
| -rw-r--r-- | indra/newview/llmeshrepository.h | 7 |
1 files changed, 2 insertions, 5 deletions
diff --git a/indra/newview/llmeshrepository.h b/indra/newview/llmeshrepository.h index 32a96a350f..4625d8edef 100644 --- a/indra/newview/llmeshrepository.h +++ b/indra/newview/llmeshrepository.h @@ -411,12 +411,9 @@ public: LLHandle<LLWholeModelFeeObserver> fee_observer= (LLHandle<LLWholeModelFeeObserver>()), LLHandle<LLWholeModelUploadObserver> upload_observer = (LLHandle<LLWholeModelUploadObserver>())); ~LLMeshUploadThread(); - void startRequest() { ++mPendingUploads; } + void startRequest(); { ++mPendingUploads; } void stopRequest() { --mPendingUploads; } - - void startRequest() { ++mPendingUploads; } - void stopRequest() { --mPendingUploads; } - + bool finished() { return mFinished; } virtual void run(); void preStart(); |