merge

2009-11-02 11:02:55 -08:00 · 2009-11-02 11:02:55 -08:00 · c8e97d83bd
parent 7d23b84327 b877665551
commit c8e97d83bd
1 changed files with 1 additions and 0 deletions
--- a/indra/newview/pipeline.cpp
+++ b/indra/newview/pipeline.cpp
@ -7908,6 +7908,7 @@ void LLPipeline::generateHighlight(LLCamera& camera)

 		mHighlight.flush();
 		gGL.setColorMask(true, false);
+		gViewerWindow->setup3DViewport();
 	}
 }