From 971e9bd203802420abcfa60d9303d89570900e3d Mon Sep 17 00:00:00 2001
From: Dave Parks <davep@lindenlab.com>
Date: Wed, 9 Jan 2013 12:41:57 -0600
Subject: [PATCH] More merge cleanup.
---
indra/newview/llmeshrepository.h | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/indra/newview/llmeshrepository.h b/indra/newview/llmeshrepository.h
index 4625d8edefb..8602271f844 100644
--- a/indra/newview/llmeshrepository.h
+++ b/indra/newview/llmeshrepository.h
@@ -411,7 +411,7 @@ 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; }
bool finished() { return mFinished; }
--
GitLab