Merge cleanup.

meow-7.2.2
Dave Parks 2013-01-09 12:08:31 -06:00
parent 954ebaed84
commit dda41e3458
1 changed files with 2 additions and 5 deletions

View File

@ -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();