1 files changed, 163 insertions, 132 deletions

diff --git a/linden/indra/newview/pipeline.cpp b/linden/indra/newview/pipeline.cpp
index e0c2de7..5f45e26 100644
--- a/linden/indra/newview/pipeline.cpp
+++ b/linden/indra/newview/pipeline.cpp
@@ -99,7 +99,7 @@
 #include "llwlparammanager.h"
 #include "llwaterparammanager.h"
 #include "llspatialpartition.h"
-
+#include "llmutelist.h"
 
 #ifdef _DEBUG
 // Debug indices is disabled for now for debug performance - djs 4/24/02
@@ -374,7 +374,6 @@ void LLPipeline::cleanup()
         mBloomImagep = NULL;
         mBloomImage2p = NULL;
         mFaceSelectImagep = NULL;
-        mAlphaSizzleImagep = NULL;
 
         mMovedBridge.clear();
 
@@ -573,19 +572,16 @@ void LLPipeline::restoreGL()
                 LLShaderMgr::setShaders();
         }
 
-        if (gWorldp)
+        for (LLWorld::region_list_t::iterator iter = LLWorld::getInstance()->getRegionList().begin(); 
+                        iter != LLWorld::getInstance()->getRegionList().end(); ++iter)
         {
-                for (LLWorld::region_list_t::iterator iter = gWorldp->getRegionList().begin(); 
-                                iter != gWorldp->getRegionList().end(); ++iter)
+                LLViewerRegion* region = *iter;
+                for (U32 i = 0; i < LLViewerRegion::NUM_PARTITIONS; i++)
                 {
-                        LLViewerRegion* region = *iter;
-                        for (U32 i = 0; i < LLViewerRegion::NUM_PARTITIONS; i++)
+                        LLSpatialPartition* part = region->getSpatialPartition(i);
+                        if (part)
                         {
-                                LLSpatialPartition* part = region->getSpatialPartition(i);
-                                if (part)
-                                {
-                                        part->restoreGL();
-                                }
+                                part->restoreGL();
                         }
                 }
         }
@@ -596,7 +592,7 @@ BOOL LLPipeline::canUseVertexShaders()
 {
         if (!gGLManager.mHasVertexShader ||
                 !gGLManager.mHasFragmentShader ||
-                !gFeatureManagerp->isFeatureAvailable("VertexShaderEnable") ||
+                !LLFeatureManager::getInstance()->isFeatureAvailable("VertexShaderEnable") ||
                 (assertInitialized() && mVertexShadersLoaded != 1) )
         {
                 return FALSE;
@@ -725,20 +721,17 @@ void LLPipeline::dirtyPoolObjectTextures(const std::set<LLViewerImage*>& texture
                 }
         }
         
-        if (gWorldp)
+        LLOctreeDirtyTexture dirty(textures);
+        for (LLWorld::region_list_t::iterator iter = LLWorld::getInstance()->getRegionList().begin(); 
+                        iter != LLWorld::getInstance()->getRegionList().end(); ++iter)
         {
-                LLOctreeDirtyTexture dirty(textures);
-                for (LLWorld::region_list_t::iterator iter = gWorldp->getRegionList().begin(); 
-                                iter != gWorldp->getRegionList().end(); ++iter)
+                LLViewerRegion* region = *iter;
+                for (U32 i = 0; i < LLViewerRegion::NUM_PARTITIONS; i++)
                 {
-                        LLViewerRegion* region = *iter;
-                        for (U32 i = 0; i < LLViewerRegion::NUM_PARTITIONS; i++)
+                        LLSpatialPartition* part = region->getSpatialPartition(i);
+                        if (part)
                         {
-                                LLSpatialPartition* part = region->getSpatialPartition(i);
-                                if (part)
-                                {
-                                        dirty.traverse(part->mOctree);
-                                }
+                                dirty.traverse(part->mOctree);
                         }
                 }
         }
@@ -1111,8 +1104,8 @@ void LLPipeline::updateMove()
         {
                 LLFastTimer ot(LLFastTimer::FTM_OCTREE_BALANCE);
 
-                for (LLWorld::region_list_t::iterator iter = gWorldp->getRegionList().begin(); 
-                        iter != gWorldp->getRegionList().end(); ++iter)
+                for (LLWorld::region_list_t::iterator iter = LLWorld::getInstance()->getRegionList().begin(); 
+                        iter != LLWorld::getInstance()->getRegionList().end(); ++iter)
                 {
                         LLViewerRegion* region = *iter;
                         for (U32 i = 0; i < LLViewerRegion::NUM_PARTITIONS; i++)
@@ -1189,8 +1182,8 @@ void LLPipeline::updateCull(LLCamera& camera, LLCullResult& result, S32 water_cl
         glColorMask(GL_FALSE, GL_FALSE, GL_FALSE, GL_FALSE);
         LLGLDepthTest depth(GL_TRUE, GL_FALSE);
 
-        for (LLWorld::region_list_t::iterator iter = gWorldp->getRegionList().begin(); 
-                        iter != gWorldp->getRegionList().end(); ++iter)
+        for (LLWorld::region_list_t::iterator iter = LLWorld::getInstance()->getRegionList().begin(); 
+                        iter != LLWorld::getInstance()->getRegionList().end(); ++iter)
         {
                 LLViewerRegion* region = *iter;
                 if (water_clip != 0)
@@ -1252,6 +1245,10 @@ void LLPipeline::updateCull(LLCamera& camera, LLCullResult& result, S32 water_cl
                 mScreen.flush();
                 glBindFramebufferEXT(GL_FRAMEBUFFER_EXT, 0);
         }
+        else if (LLPipeline::sUseOcclusion > 1)
+        {
+                glFlush();
+        }
 }
 
 void LLPipeline::markNotCulled(LLSpatialGroup* group, LLCamera& camera)
@@ -1339,6 +1336,7 @@ void LLPipeline::doOcclusion(LLCamera& camera)
         }
 
         glColorMask(GL_TRUE, GL_TRUE, GL_TRUE, GL_FALSE);
+        glFlush();
 }
         
 BOOL LLPipeline::updateDrawableGeom(LLDrawable* drawablep, BOOL priority)
@@ -1569,8 +1567,8 @@ void LLPipeline::shiftObjects(const LLVector3 &offset)
         }
         mShiftList.resize(0);
 
-        for (LLWorld::region_list_t::iterator iter = gWorldp->getRegionList().begin(); 
-                        iter != gWorldp->getRegionList().end(); ++iter)
+        for (LLWorld::region_list_t::iterator iter = LLWorld::getInstance()->getRegionList().begin(); 
+                        iter != LLWorld::getInstance()->getRegionList().end(); ++iter)
         {
                 LLViewerRegion* region = *iter;
                 for (U32 i = 0; i < LLViewerRegion::NUM_PARTITIONS; i++)
@@ -1896,7 +1894,7 @@ void renderPhysicalBeacons(LLDrawable* drawablep)
         LLViewerObject *vobj = drawablep->getVObj();
         if (vobj 
                 && !vobj->isAvatar() 
-                && !vobj->getParent()
+                //&& !vobj->getParent()
                 && vobj->usePhysics())
         {
                 if (gPipeline.sRenderBeacons)
@@ -2101,7 +2099,7 @@ void LLPipeline::postSort(LLCamera& camera)
         mSelectedFaces.clear();
         
         // Draw face highlights for selected faces.
-        if (gSelectMgr->getTEMode())
+        if (LLSelectMgr::getInstance()->getTEMode())
         {
                 struct f : public LLSelectedTEFunctor
                 {
@@ -2114,7 +2112,7 @@ void LLPipeline::postSort(LLCamera& camera)
                                 return true;
                         }
                 } func;
-                gSelectMgr->getSelection()->applyToTEs(&func);
+                LLSelectMgr::getInstance()->getSelection()->applyToTEs(&func);
         }
 }
 
@@ -2124,8 +2122,6 @@ void render_hud_elements()
         LLFastTimer t(LLFastTimer::FTM_RENDER_UI);
         gPipeline.disableLights();              
         
-        gPipeline.renderDebug();
-
         LLGLDisable fog(GL_FOG);
         LLGLSUIDefault gls_ui;
 
@@ -2143,15 +2139,9 @@ void render_hud_elements()
                 LLTracker::render3D();
                 
                 // Show the property lines
-                if (gWorldp)
-                {
-                        gWorldp->renderPropertyLines();
-                }
-                if (gParcelMgr)
-                {
-                        gParcelMgr->render();
-                        gParcelMgr->renderParcelCollision();
-                }
+                LLWorld::getInstance()->renderPropertyLines();
+                LLViewerParcelMgr::getInstance()->render();
+                LLViewerParcelMgr::getInstance()->renderParcelCollision();
         
                 // Render debugging beacons.
                 gObjectList.renderObjectBeacons();
@@ -2161,7 +2151,7 @@ void render_hud_elements()
         else if (gForceRenderLandFence)
         {
                 // This is only set when not rendering the UI, for parcel snapshots
-                gParcelMgr->render();
+                LLViewerParcelMgr::getInstance()->render();
         }
         else if (gPipeline.hasRenderType(LLPipeline::RENDER_TYPE_HUD))
         {
@@ -2257,11 +2247,6 @@ void LLPipeline::renderGeom(LLCamera& camera, BOOL forceVBOUpdate)
                 }
         }
 
-        if (!mAlphaSizzleImagep)
-        {
-                mAlphaSizzleImagep = gImageList.getImage(LLUUID(gViewerArt.getString("alpha_sizzle.tga")), MIPMAP_TRUE, TRUE);
-        }
-
         ///////////////////////////////////////////
         //
         // Sync and verify GL state
@@ -2289,15 +2274,6 @@ void LLPipeline::renderGeom(LLCamera& camera, BOOL forceVBOUpdate)
 
         LLVertexBuffer::startRender();
         
-        for (pool_set_t::iterator iter = mPools.begin(); iter != mPools.end(); ++iter)
-        {
-                LLDrawPool *poolp = *iter;
-                if (hasRenderType(poolp->getType()))
-                {
-                        poolp->prerender();
-                }
-        }
-
         //by bao
         //fake vertex buffer updating
         //to guaranttee at least updating one VBO buffer every frame
@@ -2314,7 +2290,8 @@ void LLPipeline::renderGeom(LLCamera& camera, BOOL forceVBOUpdate)
         glMatrixMode(GL_MODELVIEW);
 
         LLGLSPipeline gls_pipeline;
-        
+        LLGLEnable multisample(GL_MULTISAMPLE_ARB);
+
         LLGLState gls_color_material(GL_COLOR_MATERIAL, mLightingDetail < 2);
                                 
         // Toggle backface culling for debugging
@@ -2346,8 +2323,22 @@ void LLPipeline::renderGeom(LLCamera& camera, BOOL forceVBOUpdate)
         {
                 gObjectList.renderObjectsForSelect(camera);
         }
+        else if (gSavedSettings.getBOOL("RenderDeferred"))
+        {
+                renderGeomDeferred();
+        }
         else
         {
+                for (pool_set_t::iterator iter = mPools.begin(); iter != mPools.end(); ++iter)
+                {
+                        LLDrawPool *poolp = *iter;
+                        if (hasRenderType(poolp->getType()))
+                        {
+                                poolp->prerender();
+                        }
+                }
+
+
                 LLFastTimer t(LLFastTimer::FTM_POOLS);
                 calcNearbyLights(camera);
                 setupHWLights(NULL);
@@ -2456,7 +2447,7 @@ void LLPipeline::renderGeom(LLCamera& camera, BOOL forceVBOUpdate)
         // have touch-handlers.
         mHighlightFaces.clear();
 
-        render_hud_elements();
+        renderDebug();
 
         LLVertexBuffer::stopRender();
         LLVertexBuffer::unbind();
@@ -2479,6 +2470,19 @@ void LLPipeline::renderGeom(LLCamera& camera, BOOL forceVBOUpdate)
 #endif
 }
 
+void LLPipeline::renderGeomDeferred()
+{
+        glEnableClientState(GL_TEXTURE_COORD_ARRAY);
+        glEnableClientState(GL_NORMAL_ARRAY);
+        glEnableClientState(GL_COLOR_ARRAY);
+        gDeferredDiffuseProgram.bind();
+        gPipeline.renderObjects(LLRenderPass::PASS_SIMPLE, LLVertexBuffer::MAP_VERTEX | LLVertexBuffer::MAP_TEXCOORD | LLVertexBuffer::MAP_COLOR | LLVertexBuffer::MAP_NORMAL, TRUE);
+        gDeferredDiffuseProgram.unbind();
+        glDisableClientState(GL_COLOR_ARRAY);
+        glDisableClientState(GL_NORMAL_ARRAY);
+        glDisableClientState(GL_TEXTURE_COORD_ARRAY);
+}
+
 void LLPipeline::addTrianglesDrawn(S32 count)
 {
         assertInitialized();
@@ -2512,8 +2516,8 @@ void LLPipeline::renderDebug()
         glColorMask(GL_TRUE, GL_TRUE, GL_TRUE, GL_FALSE);
 
         // Debug stuff.
-        for (LLWorld::region_list_t::iterator iter = gWorldp->getRegionList().begin(); 
-                        iter != gWorldp->getRegionList().end(); ++iter)
+        for (LLWorld::region_list_t::iterator iter = LLWorld::getInstance()->getRegionList().begin(); 
+                        iter != LLWorld::getInstance()->getRegionList().end(); ++iter)
         {
                 LLViewerRegion* region = *iter;
                 for (U32 i = 0; i < LLViewerRegion::NUM_PARTITIONS; i++)
@@ -2585,7 +2589,7 @@ void LLPipeline::renderForSelect(std::set<LLViewerObject*>& objects)
 
         for (std::set<LLViewerObject*>::iterator iter = objects.begin(); iter != objects.end(); ++iter)
         {
-                stateSort((*iter)->mDrawable, *gCamera);
+                stateSort((*iter)->mDrawable, *LLViewerCamera::getInstance());
         }
 
         LLMemType mt(LLMemType::MTYPE_PIPELINE);
@@ -3055,7 +3059,7 @@ void LLPipeline::setupAvatarLights(BOOL for_edit)
         {
                 LLColor4 diffuse(0.8f, 0.8f, 0.8f, 0.f);
                 LLVector4 light_pos_cam(-8.f, 0.25f, 10.f, 0.f);  // w==0 => directional light
-                LLMatrix4 camera_mat = gCamera->getModelview();
+                LLMatrix4 camera_mat = LLViewerCamera::getInstance()->getModelview();
                 LLMatrix4 camera_rot(camera_mat.getMat3());
                 camera_rot.invert();
                 LLVector4 light_pos = light_pos_cam * camera_rot;
@@ -3161,7 +3165,7 @@ void LLPipeline::calcNearbyLights(LLCamera& camera)
                 // begin() == the closest light and rbegin() == the farthest light
                 const S32 MAX_LOCAL_LIGHTS = 6;
 //              LLVector3 cam_pos = gAgent.getCameraPositionAgent();
-                LLVector3 cam_pos = LLViewerJoystick::sOverrideCamera ?
+                LLVector3 cam_pos = LLViewerJoystick::getInstance()->getOverrideCamera() ?
                                                 camera.getOrigin() : 
                                                 gAgent.getPositionAgent();
 
@@ -3397,7 +3401,7 @@ void LLPipeline::setupHWLights(LLDrawPool* pool)
                 LLColor4  light_color = LLColor4::white;
                 light_color.mV[3] = 0.0f;
 
-                LLVector3 light_pos(gCamera->getOrigin());
+                LLVector3 light_pos(LLViewerCamera::getInstance()->getOrigin());
                 LLVector4 light_pos_gl(light_pos, 1.0f);
 
                 F32 light_radius = 16.f;
@@ -3958,8 +3962,8 @@ LLViewerObject* LLPipeline::pickObject(const LLVector3 &start, const LLVector3 &
 {
         LLDrawable* drawable = NULL;
 
-        for (LLWorld::region_list_t::iterator iter = gWorldp->getRegionList().begin(); 
-                        iter != gWorldp->getRegionList().end(); ++iter)
+        for (LLWorld::region_list_t::iterator iter = LLWorld::getInstance()->getRegionList().begin(); 
+                        iter != LLWorld::getInstance()->getRegionList().end(); ++iter)
         {
                 LLViewerRegion* region = *iter;
                 LLSpatialPartition* part = region->getSpatialPartition(LLViewerRegion::PARTITION_VOLUME);
@@ -4013,19 +4017,16 @@ void LLPipeline::resetVertexBuffers()
 {
         sRenderBump = gSavedSettings.getBOOL("RenderObjectBump");
 
-        if (gWorldp)
+        for (LLWorld::region_list_t::iterator iter = LLWorld::getInstance()->getRegionList().begin(); 
+                        iter != LLWorld::getInstance()->getRegionList().end(); ++iter)
         {
-                for (LLWorld::region_list_t::iterator iter = gWorldp->getRegionList().begin(); 
-                                iter != gWorldp->getRegionList().end(); ++iter)
+                LLViewerRegion* region = *iter;
+                for (U32 i = 0; i < LLViewerRegion::NUM_PARTITIONS; i++)
                 {
-                        LLViewerRegion* region = *iter;
-                        for (U32 i = 0; i < LLViewerRegion::NUM_PARTITIONS; i++)
+                        LLSpatialPartition* part = region->getSpatialPartition(i);
+                        if (part)
                         {
-                                LLSpatialPartition* part = region->getSpatialPartition(i);
-                                if (part)
-                                {
-                                        part->resetVertexBuffers();
-                                }
+                                part->resetVertexBuffers();
                         }
                 }
         }
@@ -4217,7 +4218,7 @@ void LLPipeline::generateReflectionMap(LLCubeMap* cube_map, LLCamera& cube_cam)
                 glTranslatef(-origin.mV[0], -origin.mV[1], -origin.mV[2]);
                 cube_cam.setOrigin(origin);
                 LLViewerCamera::updateFrustumPlanes(cube_cam);
-                cube_cam.setOrigin(gCamera->getOrigin());
+                cube_cam.setOrigin(LLViewerCamera::getInstance()->getOrigin());
                 static LLCullResult result;
                 gPipeline.updateCull(cube_cam, result);
                 gPipeline.stateSort(cube_cam, result);
@@ -4814,6 +4815,7 @@ void LLPipeline::renderBloom(BOOL for_snapshot)
                 
                 mScreen.bindTexture();
                 
+                LLGLEnable multisample(GL_MULTISAMPLE_ARB);
                 glDrawArrays(GL_TRIANGLE_STRIP, 0, 4);
                 
                 glDisable(GL_TEXTURE_RECTANGLE_ARB);
@@ -4840,8 +4842,8 @@ void LLPipeline::renderBloom(BOOL for_snapshot)
 
 void LLPipeline::processImagery(LLCamera& camera)
 {
-        for (LLWorld::region_list_t::iterator iter = gWorldp->getRegionList().begin(); 
-                        iter != gWorldp->getRegionList().end(); ++iter)
+        for (LLWorld::region_list_t::iterator iter = LLWorld::getInstance()->getRegionList().begin(); 
+                        iter != LLWorld::getInstance()->getRegionList().end(); ++iter)
         {
                 LLViewerRegion* region = *iter;
                 LLSpatialPartition* part = region->getSpatialPartition(LLViewerRegion::PARTITION_VOLUME);
@@ -4886,7 +4888,7 @@ void LLPipeline::generateWaterReflection(LLCamera& camera_in)
                 F32 pd;
 
                 S32 water_clip = 0;
-                if (!gCamera->cameraUnderWater())
+                if (!LLViewerCamera::getInstance()->cameraUnderWater())
                 { //camera is above water, clip plane points up
                         pnorm.setVec(0,0,1);
                         pd = -height;
@@ -4903,7 +4905,7 @@ void LLPipeline::generateWaterReflection(LLCamera& camera_in)
 
 
 
-                if (!gCamera->cameraUnderWater())
+                if (!LLViewerCamera::getInstance()->cameraUnderWater())
                 {       //generate planar reflection map
                         LLViewerImage::unbindTexture(0, GL_TEXTURE_2D);
                         glClearColor(0,0,0,0);
@@ -4948,13 +4950,12 @@ void LLPipeline::generateWaterReflection(LLCamera& camera_in)
                                 mRenderTypeMask = tmp;
                         }
 
-                        if (LLDrawPoolWater::sNeedsReflectionUpdate)
+                        if (LLDrawPoolWater::sNeedsDistortionUpdate)
                         {
                                 mRenderTypeMask &=      ~((1<<LLPipeline::RENDER_TYPE_WATER) |
                                                                           (1<<LLPipeline::RENDER_TYPE_GROUND) |
                                                                           (1<<LLPipeline::RENDER_TYPE_SKY) |
-                                                                          (1<<LLPipeline::RENDER_TYPE_CLOUDS) |
-                                                                          (1<<LLPipeline::RENDER_TYPE_WL_SKY)); 
+                                                                          (1<<LLPipeline::RENDER_TYPE_CLOUDS)); 
 
                                 if (gSavedSettings.getBOOL("RenderWaterReflections"))
                                 { //mask out selected geometry based on reflection detail
@@ -5000,7 +5001,7 @@ void LLPipeline::generateWaterReflection(LLCamera& camera_in)
                                                                                         (1<<LLPipeline::RENDER_TYPE_GROUND));   
                         stop_glerror();
 
-                        LLPipeline::sUnderWaterRender = gCamera->cameraUnderWater() ? FALSE : TRUE;
+                        LLPipeline::sUnderWaterRender = LLViewerCamera::getInstance()->cameraUnderWater() ? FALSE : TRUE;
 
                         if (LLPipeline::sUnderWaterRender)
                         {
@@ -5034,7 +5035,7 @@ void LLPipeline::generateWaterReflection(LLCamera& camera_in)
                         LLPipeline::sUnderWaterRender = FALSE;
                         mWaterDis.flush();
                 }
-                last_update = LLDrawPoolWater::sNeedsReflectionUpdate;
+                last_update = LLDrawPoolWater::sNeedsReflectionUpdate && LLDrawPoolWater::sNeedsDistortionUpdate;
 
                 glBindFramebufferEXT(GL_FRAMEBUFFER_EXT, 0);
                 LLPipeline::sReflectionRender = FALSE;
@@ -5048,14 +5049,15 @@ void LLPipeline::generateWaterReflection(LLCamera& camera_in)
                 gViewerWindow->setupViewport();
                 mRenderTypeMask = type_mask;
                 LLDrawPoolWater::sNeedsReflectionUpdate = FALSE;
-                gCamera->setUserClipPlane(LLPlane(-pnorm, -pd));
+                LLDrawPoolWater::sNeedsDistortionUpdate = FALSE;
+                LLViewerCamera::getInstance()->setUserClipPlane(LLPlane(-pnorm, -pd));
                 LLPipeline::sUseOcclusion = occlusion;
         }
 }
 
 LLCubeMap* LLPipeline::findReflectionMap(const LLVector3& location)
 {
-        LLViewerRegion* region = gWorldp->getRegionFromPosAgent(location);
+        LLViewerRegion* region = LLWorld::getInstance()->getRegionFromPosAgent(location);
         if (region)
         {
                 LLSpatialPartition* part = region->getSpatialPartition(LLViewerRegion::PARTITION_VOLUME);
@@ -5075,10 +5077,6 @@ LLCubeMap* LLPipeline::findReflectionMap(const LLVector3& location)
 
 void LLPipeline::renderGroups(LLRenderPass* pass, U32 type, U32 mask, BOOL texture)
 {
-#if !LL_RELEASE_FOR_DOWNLOAD
-        LLGLState::checkClientArrays(mask);
-#endif
-
         for (LLCullResult::sg_list_t::iterator i = sCull->beginVisibleGroups(); i != sCull->endVisibleGroups(); ++i)
         {
                 LLSpatialGroup* group = *i;
@@ -5105,22 +5103,23 @@ void LLPipeline::generateImpostor(LLVOAvatar* avatar)
 
         assertInitialized();
 
-        if (!avatar->mImpostor.isComplete())
+        U32 mask;
+        BOOL muted = LLMuteList::getInstance()->isMuted(avatar->getID());
+
+        if (muted)
         {
-                avatar->mImpostor.allocate(128,256,GL_RGBA,TRUE);
-                avatar->mImpostor.bindTexture();
-                glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_MAG_FILTER, GL_NEAREST);
-                glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_MIN_FILTER, GL_NEAREST);
-                LLImageGL::unbindTexture(0, GL_TEXTURE_2D);
+                mask  = 1 << LLPipeline::RENDER_TYPE_AVATAR;
         }
-
-        U32 mask = (1<<LLPipeline::RENDER_TYPE_VOLUME) |
+        else
+        {
+                mask  = (1<<LLPipeline::RENDER_TYPE_VOLUME) |
                                 (1<<LLPipeline::RENDER_TYPE_AVATAR) |
                                 (1<<LLPipeline::RENDER_TYPE_BUMP) |
                                 (1<<LLPipeline::RENDER_TYPE_GRASS) |
                                 (1<<LLPipeline::RENDER_TYPE_SIMPLE) |
                                 (1<<LLPipeline::RENDER_TYPE_ALPHA) | 
                                 (1<<LLPipeline::RENDER_TYPE_INVISIBLE);
+        }
         
         mask = mask & gPipeline.getRenderTypeMask();
         U32 saved_mask = gPipeline.mRenderTypeMask;
@@ -5131,7 +5130,7 @@ void LLPipeline::generateImpostor(LLVOAvatar* avatar)
         sReflectionRender = TRUE;
         sImpostorRender = TRUE;
 
-        markVisible(avatar->mDrawable, *gCamera);
+        markVisible(avatar->mDrawable, *LLViewerCamera::getInstance());
         LLVOAvatar::sUseImpostors = FALSE;
 
         LLVOAvatar::attachment_map_t::iterator iter;
@@ -5142,36 +5141,18 @@ void LLPipeline::generateImpostor(LLVOAvatar* avatar)
                 LLViewerObject* object = iter->second->getObject();
                 if (object)
                 {
-                        markVisible(object->mDrawable->getSpatialBridge(), *gCamera);
+                        markVisible(object->mDrawable->getSpatialBridge(), *LLViewerCamera::getInstance());
                 }
         }
 
-        stateSort(*gCamera, result);
+        stateSort(*LLViewerCamera::getInstance(), result);
         
-        glClearColor(0.0f,0.0f,0.0f,0.0f);
-        glColorMask(GL_TRUE, GL_TRUE, GL_TRUE, GL_TRUE);
-        glStencilMask(0xFFFFFFFF);
-        glClearStencil(0);
-
-        {
-                LLGLEnable scissor(GL_SCISSOR_TEST);
-                glScissor(0, 0, 128, 256);
-                avatar->mImpostor.bindTarget();
-                avatar->mImpostor.getViewport(gGLViewport);
-                glClear(GL_COLOR_BUFFER_BIT | GL_DEPTH_BUFFER_BIT | GL_STENCIL_BUFFER_BIT);
-        }
-        
-        LLGLEnable stencil(GL_STENCIL_TEST);
-
-        glStencilFunc(GL_ALWAYS, 1, 0xFFFFFFFF);
-        glStencilOp(GL_KEEP, GL_KEEP, GL_REPLACE);
-
         const LLVector3* ext = avatar->mDrawable->getSpatialExtents();
         LLVector3 pos(avatar->getRenderPosition()+avatar->getImpostorOffset());
 
-        LLCamera camera = *gCamera;
+        LLCamera camera = *LLViewerCamera::getInstance();
 
-        camera.lookAt(gCamera->getOrigin(), pos, gCamera->getUpAxis());
+        camera.lookAt(LLViewerCamera::getInstance()->getOrigin(), pos, LLViewerCamera::getInstance()->getUpAxis());
         
         LLVector2 tdim;
 
@@ -5190,9 +5171,13 @@ void LLPipeline::generateImpostor(LLVOAvatar* avatar)
 
         glMatrixMode(GL_PROJECTION);
         glPushMatrix();
-        glh::matrix4f ortho = gl_ortho(-tdim.mV[0], tdim.mV[0], -tdim.mV[1], tdim.mV[1], 1.0, 256.0);
-        glh_set_current_projection(ortho);
-        glLoadMatrixf(ortho.m);
+        //glh::matrix4f ortho = gl_ortho(-tdim.mV[0], tdim.mV[0], -tdim.mV[1], tdim.mV[1], 1.0, 256.0);
+        F32 distance = (pos-camera.getOrigin()).magVec();
+        F32 fov = atanf(tdim.mV[1]/distance)*2.f*RAD_TO_DEG;
+        F32 aspect = tdim.mV[0]/tdim.mV[1]; //128.f/256.f;
+        glh::matrix4f persp = gl_perspective(fov, aspect, 1.f, 256.f);
+        glh_set_current_projection(persp);
+        glLoadMatrixf(persp.m);
 
         glMatrixMode(GL_MODELVIEW);
         glPushMatrix();
@@ -5204,24 +5189,68 @@ void LLPipeline::generateImpostor(LLVOAvatar* avatar)
         glLoadMatrixf(mat.m);
         glh_set_current_modelview(mat);
 
+        glClearColor(0.0f,0.0f,0.0f,0.0f);
+        glColorMask(GL_TRUE, GL_TRUE, GL_TRUE, GL_TRUE);
+        glStencilMask(0xFFFFFFFF);
+        glClearStencil(0);
+
+        // get the number of pixels per angle
+        F32 pa = gViewerWindow->getWindowDisplayHeight() / (RAD_TO_DEG * LLViewerCamera::getInstance()->getView());
+
+        //get resolution based on angle width and height of impostor (double desired resolution to prevent aliasing)
+        U32 resY = llmin(nhpo2((U32) (fov*pa)), (U32) 512);
+        U32 resX = llmin(nhpo2((U32) (atanf(tdim.mV[0]/distance)*2.f*RAD_TO_DEG*pa)), (U32) 512);
+
+        if (!avatar->mImpostor.isComplete() || resX != avatar->mImpostor.getWidth() ||
+                resY != avatar->mImpostor.getHeight())
+        {
+                avatar->mImpostor.allocate(resX,resY,GL_RGBA,TRUE);
+                avatar->mImpostor.bindTexture();
+                glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_MAG_FILTER, GL_NEAREST);
+                glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_MIN_FILTER, GL_NEAREST);
+                LLImageGL::unbindTexture(0, GL_TEXTURE_2D);
+        }
+
+        {
+                LLGLEnable scissor(GL_SCISSOR_TEST);
+                glScissor(0, 0, resX, resY);
+                avatar->mImpostor.bindTarget();
+                avatar->mImpostor.getViewport(gGLViewport);
+                glClear(GL_COLOR_BUFFER_BIT | GL_DEPTH_BUFFER_BIT | GL_STENCIL_BUFFER_BIT);
+        }
+        
+        LLGLEnable stencil(GL_STENCIL_TEST);
+
+        glStencilFunc(GL_ALWAYS, 1, 0xFFFFFFFF);
+        glStencilOp(GL_KEEP, GL_KEEP, GL_REPLACE);
+
         renderGeom(camera);
         
         glStencilOp(GL_KEEP, GL_KEEP, GL_KEEP);
         glStencilFunc(GL_EQUAL, 1, 0xFFFFFF);
 
         {
-                glColorMask(GL_TRUE, GL_TRUE, GL_TRUE, GL_TRUE);
                 LLVector3 left = camera.getLeftAxis()*tdim.mV[0]*2.f;
                 LLVector3 up = camera.getUpAxis()*tdim.mV[1]*2.f;
 
-                LLGLEnable blend(GL_BLEND);
+                LLGLEnable blend(muted ? 0 : GL_BLEND);
+
+                if (muted)
+                {
+                        glColorMask(GL_TRUE, GL_TRUE, GL_TRUE, GL_TRUE);
+                }
+                else
+                {
+                        glColorMask(GL_FALSE, GL_FALSE, GL_FALSE, GL_TRUE);
+                }
+                
                 gGL.blendFunc(GL_ONE, GL_ONE);
                 LLImageGL::unbindTexture(0, GL_TEXTURE_2D);
 
                 LLGLDepthTest depth(GL_FALSE, GL_FALSE);
 
                 gGL.start();
-                gGL.color4ub(0,0,0,1);
+                gGL.color4ub(64,64,64,1);
                 gGL.begin(GL_QUADS);
                 gGL.vertex3fv((pos+left-up).mV);
                 gGL.vertex3fv((pos-left-up).mV);
@@ -5230,9 +5259,11 @@ void LLPipeline::generateImpostor(LLVOAvatar* avatar)
                 gGL.end();
                 gGL.stop();
 
+
                 gGL.blendFunc(GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA);
         }
 
+
         avatar->mImpostor.flush();
 
         avatar->setImpostorDim(tdim);