1 files changed, 61 insertions, 8 deletions

diff --git a/linden/indra/newview/pipeline.cpp b/linden/indra/newview/pipeline.cpp
index cd9b3be..ae7461c 100644
--- a/linden/indra/newview/pipeline.cpp
+++ b/linden/indra/newview/pipeline.cpp
@@ -232,6 +232,7 @@ BOOL	LLPipeline::sPickAvatar = TRUE;
 BOOL    LLPipeline::sDynamicLOD = TRUE;
 BOOL    LLPipeline::sShowHUDAttachments = TRUE;
 BOOL    LLPipeline::sRenderPhysicalBeacons = TRUE;
+BOOL    LLPipeline::sRenderMOAPBeacons = FALSE;
 BOOL    LLPipeline::sRenderScriptedBeacons = FALSE;
 BOOL    LLPipeline::sRenderScriptedTouchBeacons = TRUE;
 BOOL    LLPipeline::sRenderParticleBeacons = FALSE;
@@ -2149,6 +2150,43 @@ void renderPhysicalBeacons(LLDrawable* drawablep)
         }
 }
 
+void renderMOAPBeacons(LLDrawable* drawablep)
+{
+        LLViewerObject *vobj = drawablep->getVObj();
+
+        if(!vobj || vobj->isAvatar())
+                return;
+
+        BOOL beacon=FALSE;
+        U8 tecount=vobj->getNumTEs();
+        for(int x=0;x<tecount;x++)
+        {
+                if(vobj->getTE(x)->hasMedia())
+                {
+                        beacon=TRUE;
+                        break;
+                }
+        }
+        if(beacon==TRUE)
+        {
+                if (gPipeline.sRenderBeacons)
+                {
+                        gObjectList.addDebugBeacon(vobj->getPositionAgent(), "", LLColor4(0.f, 1.f, 0.f, 0.5f), LLColor4(1.f, 1.f, 1.f, 0.5f), gSavedSettings.getS32("DebugBeaconLineWidth"));
+                }
+
+                if (gPipeline.sRenderHighlight)
+                {
+                        S32 face_id;
+                        S32 count = drawablep->getNumFaces();
+                        for (face_id = 0; face_id < count; face_id++)
+                        {
+                                gPipeline.mHighlightFaces.push_back(drawablep->getFace(face_id) );
+                        }
+                }
+        }
+}
+
+
 void renderParticleBeacons(LLDrawable* drawablep)
 {
         // Look for attachments, objects, etc.
@@ -2231,18 +2269,12 @@ void LLPipeline::postSort(LLCamera& camera)
         const S32 bin_count = 1024*8;
                 
         static LLCullResult::drawinfo_list_t alpha_bins[bin_count];
-        static U32 bin_size[bin_count];
 
         //clear one bin per frame to avoid memory bloat
         static S32 clear_idx = 0;
         clear_idx = (1+clear_idx)%bin_count;
         alpha_bins[clear_idx].clear();
 
-        for (U32 j = 0; j < bin_count; j++)
-        {
-                bin_size[j] = 0;
-        }
-
         //build render map
         for (LLCullResult::sg_list_t::iterator i = sCull->beginVisibleGroups(); i != sCull->endVisibleGroups(); ++i)
         {
@@ -2329,6 +2361,11 @@ void LLPipeline::postSort(LLCamera& camera)
                         forAllVisibleDrawables(renderPhysicalBeacons);
                 }
 
+                if(sRenderMOAPBeacons)
+                {
+                        forAllVisibleDrawables(renderMOAPBeacons);
+                }
+
                 if (sRenderParticleBeacons)
                 {
                         forAllVisibleDrawables(renderParticleBeacons);
@@ -4563,6 +4600,24 @@ BOOL LLPipeline::getRenderScriptedTouchBeacons(void*)
 }
 
 // static
+void LLPipeline::setRenderMOAPBeacons(BOOL val)
+{
+        sRenderMOAPBeacons = val;
+}
+
+// static
+void LLPipeline::toggleRenderMOAPBeacons(void*)
+{
+        sRenderMOAPBeacons = !sRenderMOAPBeacons;
+}
+
+// static
+BOOL LLPipeline::getRenderMOAPBeacons(void*)
+{
+        return sRenderMOAPBeacons;
+}
+
+// static
 void LLPipeline::setRenderPhysicalBeacons(BOOL val)
 {
         sRenderPhysicalBeacons = val;
@@ -5895,8 +5950,6 @@ void LLPipeline::generateWaterReflection(LLCamera& camera_in)
 
                         stop_glerror();
 
-                        LLVector3 origin = camera.getOrigin();
-
                         glPushMatrix();
 
                         mat.set_scale(glh::vec3f(1,1,-1));