diff options
| author | Rider Linden <rider@lindenlab.com> | 2018-09-25 22:47:41 +0000 |
|---|---|---|
| committer | Rider Linden <rider@lindenlab.com> | 2018-09-25 22:47:41 +0000 |
| commit | cca55533f88e6e50ac006f34708b7184b6a6859c (patch) | |
| tree | 54ed3a90e4ef296a8b348c5db4811b352acd6952 /indra/newview/llvovolume.cpp | |
| parent | 2a1a7396b22246ae526731d02a8548990187fe1b (diff) | |
| parent | 3778dd40856a1a56a6ce595ae08fb7e94cabae0d (diff) | |
Merged in graham_linden/viewer-eep-graham (pull request #112)
SL-9711, SL-1505, SL-9708
Diffstat (limited to 'indra/newview/llvovolume.cpp')
| -rw-r--r-- | indra/newview/llvovolume.cpp | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/indra/newview/llvovolume.cpp b/indra/newview/llvovolume.cpp index d4c8d4f923..f046a903ed 100644 --- a/indra/newview/llvovolume.cpp +++ b/indra/newview/llvovolume.cpp @@ -2194,8 +2194,9 @@ bool LLVOVolume::notifyAboutMissingAsset(LLViewerTexture *texture) mat->setSpecularID(LLUUID::null); } break; - default: - break; + case LLRender::NUM_TEXTURE_CHANNELS: + //nothing to do, make compiler happy + break; } //switch } //for |