diff options
| -rwxr-xr-x[-rw-r--r--] | .hgtags | 0 | ||||
| -rwxr-xr-x[-rw-r--r--] | indra/llimage/llimagej2c.cpp | 0 | ||||
| -rwxr-xr-x[-rw-r--r--] | indra/llkdu/tests/llimagej2ckdu_test.cpp | 0 | ||||
| -rwxr-xr-x[-rw-r--r--] | indra/llprimitive/llprimitive.cpp | 0 | ||||
| -rwxr-xr-x[-rw-r--r--] | indra/llrender/llimagegl.cpp | 0 | ||||
| -rwxr-xr-x[-rw-r--r--] | indra/llrender/llimagegl.h | 0 | ||||
| -rwxr-xr-x[-rw-r--r--] | indra/newview/CMakeLists.txt | 0 | ||||
| -rwxr-xr-x[-rw-r--r--] | indra/newview/app_settings/settings.xml | 0 | ||||
| -rwxr-xr-x[-rw-r--r--] | indra/newview/llface.cpp | 0 | ||||
| -rwxr-xr-x | indra/newview/llmeshrepository.cpp | 8 | ||||
| -rw-r--r-- | indra/newview/llmeshrepository.h | 2 | ||||
| -rwxr-xr-x[-rw-r--r--] | indra/newview/llstartup.cpp | 0 | ||||
| -rwxr-xr-x[-rw-r--r--] | indra/newview/llstartup.h | 0 | ||||
| -rw-r--r--[-rwxr-xr-x] | indra/newview/lltexturefetch.cpp | 0 | ||||
| -rwxr-xr-x[-rw-r--r--] | indra/newview/lltextureview.cpp | 0 | ||||
| -rwxr-xr-x[-rw-r--r--] | indra/newview/llviewerstats.cpp | 0 | ||||
| -rwxr-xr-x[-rw-r--r--] | indra/newview/llviewertexture.h | 0 | ||||
| -rwxr-xr-x[-rw-r--r--] | indra/newview/llvoavatar.cpp | 0 | ||||
| -rwxr-xr-x[-rw-r--r--] | indra/newview/llvoavatarself.cpp | 0 |
19 files changed, 9 insertions, 1 deletions
diff --git a/indra/llimage/llimagej2c.cpp b/indra/llimage/llimagej2c.cpp index 5412f98ee5..5412f98ee5 100644..100755 --- a/indra/llimage/llimagej2c.cpp +++ b/indra/llimage/llimagej2c.cpp diff --git a/indra/llkdu/tests/llimagej2ckdu_test.cpp b/indra/llkdu/tests/llimagej2ckdu_test.cpp index 62c245f125..62c245f125 100644..100755 --- a/indra/llkdu/tests/llimagej2ckdu_test.cpp +++ b/indra/llkdu/tests/llimagej2ckdu_test.cpp diff --git a/indra/llprimitive/llprimitive.cpp b/indra/llprimitive/llprimitive.cpp index 946251f383..946251f383 100644..100755 --- a/indra/llprimitive/llprimitive.cpp +++ b/indra/llprimitive/llprimitive.cpp diff --git a/indra/llrender/llimagegl.cpp b/indra/llrender/llimagegl.cpp index a4d7872ec2..a4d7872ec2 100644..100755 --- a/indra/llrender/llimagegl.cpp +++ b/indra/llrender/llimagegl.cpp diff --git a/indra/llrender/llimagegl.h b/indra/llrender/llimagegl.h index cf3c484c79..cf3c484c79 100644..100755 --- a/indra/llrender/llimagegl.h +++ b/indra/llrender/llimagegl.h diff --git a/indra/newview/CMakeLists.txt b/indra/newview/CMakeLists.txt index e93d73ad0e..e93d73ad0e 100644..100755 --- a/indra/newview/CMakeLists.txt +++ b/indra/newview/CMakeLists.txt diff --git a/indra/newview/app_settings/settings.xml b/indra/newview/app_settings/settings.xml index b302f5c9b9..b302f5c9b9 100644..100755 --- a/indra/newview/app_settings/settings.xml +++ b/indra/newview/app_settings/settings.xml diff --git a/indra/newview/llface.cpp b/indra/newview/llface.cpp index 28e4b32793..28e4b32793 100644..100755 --- a/indra/newview/llface.cpp +++ b/indra/newview/llface.cpp diff --git a/indra/newview/llmeshrepository.cpp b/indra/newview/llmeshrepository.cpp index 09003e3e53..e81c863608 100755 --- a/indra/newview/llmeshrepository.cpp +++ b/indra/newview/llmeshrepository.cpp @@ -416,6 +416,14 @@ public: } } + ~LLWholeModelFeeResponder() + { + if (mThread) + { + mThread->stopRequest(); + } + } + virtual void completed(U32 status, const std::string& reason, const LLSD& content) diff --git a/indra/newview/llmeshrepository.h b/indra/newview/llmeshrepository.h index 8602271f84..8eaf691d6f 100644 --- a/indra/newview/llmeshrepository.h +++ b/indra/newview/llmeshrepository.h @@ -413,7 +413,7 @@ public: void startRequest() { ++mPendingUploads; } void stopRequest() { --mPendingUploads; } - + bool finished() { return mFinished; } virtual void run(); void preStart(); diff --git a/indra/newview/llstartup.cpp b/indra/newview/llstartup.cpp index 0e3007724b..0e3007724b 100644..100755 --- a/indra/newview/llstartup.cpp +++ b/indra/newview/llstartup.cpp diff --git a/indra/newview/llstartup.h b/indra/newview/llstartup.h index 760e38890b..760e38890b 100644..100755 --- a/indra/newview/llstartup.h +++ b/indra/newview/llstartup.h diff --git a/indra/newview/lltexturefetch.cpp b/indra/newview/lltexturefetch.cpp index 7de66b139f..7de66b139f 100755..100644 --- a/indra/newview/lltexturefetch.cpp +++ b/indra/newview/lltexturefetch.cpp diff --git a/indra/newview/lltextureview.cpp b/indra/newview/lltextureview.cpp index 16c42dbd43..16c42dbd43 100644..100755 --- a/indra/newview/lltextureview.cpp +++ b/indra/newview/lltextureview.cpp diff --git a/indra/newview/llviewerstats.cpp b/indra/newview/llviewerstats.cpp index 35839ae459..35839ae459 100644..100755 --- a/indra/newview/llviewerstats.cpp +++ b/indra/newview/llviewerstats.cpp diff --git a/indra/newview/llviewertexture.h b/indra/newview/llviewertexture.h index 2eaa0ac92d..2eaa0ac92d 100644..100755 --- a/indra/newview/llviewertexture.h +++ b/indra/newview/llviewertexture.h diff --git a/indra/newview/llvoavatar.cpp b/indra/newview/llvoavatar.cpp index 62e93b7a53..62e93b7a53 100644..100755 --- a/indra/newview/llvoavatar.cpp +++ b/indra/newview/llvoavatar.cpp diff --git a/indra/newview/llvoavatarself.cpp b/indra/newview/llvoavatarself.cpp index e32fd3c3c8..e32fd3c3c8 100644..100755 --- a/indra/newview/llvoavatarself.cpp +++ b/indra/newview/llvoavatarself.cpp |