diff options
author | Kent Quirk <q@lindenlab.com> | 2010-06-25 08:55:46 -0400 |
---|---|---|
committer | Kent Quirk <q@lindenlab.com> | 2010-06-25 08:55:46 -0400 |
commit | 7aa6fd235d96fc1394b98eb48ad94471b6d5b4c9 (patch) | |
tree | 9e00a401da8db6457051da2612423b1eeedd061a /indra/newview/llvoavatarself.cpp | |
parent | 23706afa6431e34f821baa925ada220b06833a97 (diff) | |
parent | c77efc92e3ebcb9af9bb997e5b709484153844d4 (diff) |
Merge from q/viewer-release
Diffstat (limited to 'indra/newview/llvoavatarself.cpp')
-rw-r--r-- | indra/newview/llvoavatarself.cpp | 10 |
1 files changed, 10 insertions, 0 deletions
diff --git a/indra/newview/llvoavatarself.cpp b/indra/newview/llvoavatarself.cpp index 91af5fefde..982d9c375c 100644 --- a/indra/newview/llvoavatarself.cpp +++ b/indra/newview/llvoavatarself.cpp @@ -2261,6 +2261,16 @@ void LLVOAvatarSelf::processRebakeAvatarTextures(LLMessageSystem* msg, void**) } } +BOOL LLVOAvatarSelf::isUsingBakedTextures() const +{ + // Composite textures are used during appearance mode. + if (gAgentCamera.cameraCustomizeAvatar()) + return FALSE; + + return TRUE; +} + + void LLVOAvatarSelf::forceBakeAllTextures(bool slam_for_debug) { llinfos << "TAT: forced full rebake. " << llendl; |