diff options
| -rw-r--r-- | indra/llui/llflatlistview.h | 2 | ||||
| -rw-r--r-- | indra/newview/pipeline.cpp | 4 |
2 files changed, 4 insertions, 2 deletions
diff --git a/indra/llui/llflatlistview.h b/indra/llui/llflatlistview.h index 3c40f91ab0..112c330a15 100644 --- a/indra/llui/llflatlistview.h +++ b/indra/llui/llflatlistview.h @@ -126,7 +126,7 @@ public: /** Returns full rect of child panel */ const LLRect& getItemsRect() const; - LLRect getRequiredRect() const { return getItemsRect(); } + LLRect getRequiredRect() { return getItemsRect(); } /** Returns distance between items */ const S32 getItemsPad() const { return mItemPad; } diff --git a/indra/newview/pipeline.cpp b/indra/newview/pipeline.cpp index e7703b0ffe..84f026699e 100644 --- a/indra/newview/pipeline.cpp +++ b/indra/newview/pipeline.cpp @@ -8342,7 +8342,9 @@ void LLPipeline::renderDeferredLighting() unbindDeferredShader(gDeferredBlurLightProgram); } screen_target->bindTarget(); - screen_target->invalidate(GL_COLOR_BUFFER_BIT); + // clear color buffer here - zeroing alpha (glow) is important or it will accumulate against sky + glClearColor(0, 0, 0, 0); + screen_target->clear(GL_COLOR_BUFFER_BIT); if (RenderDeferredAtmospheric) { // apply sunlight contribution |