From dda41e3458702bcd7e4d671613982ff2273a94f1 Mon Sep 17 00:00:00 2001
From: Dave Parks <davep@lindenlab.com>
Date: Wed, 9 Jan 2013 12:08:31 -0600
Subject: [PATCH] Merge cleanup.
---
indra/newview/llmeshrepository.h | 7 ++-----
1 file changed, 2 insertions(+), 5 deletions(-)
diff --git a/indra/newview/llmeshrepository.h b/indra/newview/llmeshrepository.h
index 32a96a350f1..4625d8edefb 100644
--- a/indra/newview/llmeshrepository.h
+++ b/indra/newview/llmeshrepository.h
@@ -411,12 +411,9 @@ class LLMeshUploadThread : public LLThread
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();
--
GitLab