diff options
| author | Merov Linden <merov@lindenlab.com> | 2010-10-07 12:30:15 -0700 |
|---|---|---|
| committer | Merov Linden <merov@lindenlab.com> | 2010-10-07 12:30:15 -0700 |
| commit | d25a30e55b7e6a20173c3a53891489adc5610d72 (patch) | |
| tree | edca48be8a02e94926abb5c13b5db153a3d5eb1c | |
| parent | ac76af0e2d81c777eb1fafbce09a7e60ca73ffbc (diff) | |
| parent | 7d9ec365cc815fad03c31bfaf9acf5d871c2e11b (diff) | |
Pull and merge of viewer-beta in viewer-development
| -rw-r--r-- | indra/llui/llbutton.cpp | 2 | ||||
| -rw-r--r-- | indra/newview/pipeline.cpp | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/indra/llui/llbutton.cpp b/indra/llui/llbutton.cpp index f26711065a..65ef3e5f8f 100644 --- a/indra/llui/llbutton.cpp +++ b/indra/llui/llbutton.cpp @@ -499,7 +499,7 @@ void LLButton::onMouseEnter(S32 x, S32 y, MASK mask) if (isInEnabledChain()) mNeedsHighlight = TRUE; - } +} void LLButton::onMouseLeave(S32 x, S32 y, MASK mask) { diff --git a/indra/newview/pipeline.cpp b/indra/newview/pipeline.cpp index 1ee3b84b5e..e69b0a2996 100644 --- a/indra/newview/pipeline.cpp +++ b/indra/newview/pipeline.cpp @@ -4814,7 +4814,7 @@ void LLPipeline::enableLightsFullbright(const LLColor4& color) void LLPipeline::disableLights() { enableLights(0); // no lighting (full bright) - //glColor4f(1.f, 1.f, 1.f, 1.f); // lighting color = white by default + glColor4f(1.f, 1.f, 1.f, 1.f); // lighting color = white by default } //============================================================================ |