diff options
author | Dave Parks <davep@lindenlab.com> | 2013-01-08 13:40:59 -0600 |
---|---|---|
committer | Dave Parks <davep@lindenlab.com> | 2013-01-08 13:40:59 -0600 |
commit | 954ebaed84f934437fc3a18c937f08fc527359e3 (patch) | |
tree | 93f6d2c12a93045db66337bdb17167f0b312b785 /indra/newview/llmeshrepository.h | |
parent | 716e2ea3b1e25ac8da64343d02310e8f086c48e7 (diff) | |
parent | b601bc3cbf5e999b4fd0b0b9ae024397b92cce39 (diff) |
Automated merge with https://bitbucket.org/lindenlab/viewer-tiger
Diffstat (limited to 'indra/newview/llmeshrepository.h')
-rw-r--r-- | indra/newview/llmeshrepository.h | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/indra/newview/llmeshrepository.h b/indra/newview/llmeshrepository.h index 8eaf691d6f..32a96a350f 100644 --- a/indra/newview/llmeshrepository.h +++ b/indra/newview/llmeshrepository.h @@ -414,6 +414,9 @@ public: void startRequest() { ++mPendingUploads; } void stopRequest() { --mPendingUploads; } + void startRequest() { ++mPendingUploads; } + void stopRequest() { --mPendingUploads; } + bool finished() { return mFinished; } virtual void run(); void preStart(); |