SL-20611 Followup -- fix for water rendering twice. Add comments around LLEventPoll hack.

1 files changed, 0 insertions, 52 deletions

diff --git a/indra/newview/llworld.cpp b/indra/newview/llworld.cpp
index 709a457862..9381211e9b 100644
--- a/indra/newview/llworld.cpp
+++ b/indra/newview/llworld.cpp
@@ -883,58 +883,6 @@ void LLWorld::waterHeightRegionInfo(std::string const& sim_name, F32 water_heigh
 	}
 }
 
-void LLWorld::precullWaterObjects(LLCamera& camera, LLCullResult* cull, bool include_void_water)
-{
-    LL_PROFILE_ZONE_SCOPED_CATEGORY_PIPELINE;
-	if (!gAgent.getRegion())
-	{
-		return;
-	}
-
-	if (mRegionList.empty())
-	{
-		LL_WARNS() << "No regions!" << LL_ENDL;
-		return;
-	}
-
-	for (region_list_t::iterator iter = mRegionList.begin();
-		 iter != mRegionList.end(); ++iter)
-	{
-		LLViewerRegion* regionp = *iter;
-		LLVOWater* waterp = regionp->getLand().getWaterObj();
-		if (waterp && waterp->mDrawable)
-		{
-			waterp->mDrawable->setVisible(camera);
-		    cull->pushDrawable(waterp->mDrawable);
-		}
-	}
-
-    if (include_void_water)
-    {
-		for (std::list<LLPointer<LLVOWater> >::iterator iter = mHoleWaterObjects.begin();
-			 iter != mHoleWaterObjects.end(); ++ iter)
-		{
-			LLVOWater* waterp = (*iter).get();
-		    if (waterp && waterp->mDrawable)
-            {
-                waterp->mDrawable->setVisible(camera);
-		        cull->pushDrawable(waterp->mDrawable);
-            }
-	    }
-    }
-
-	S32 dir;
-	for (dir = 0; dir < EDGE_WATER_OBJECTS_COUNT; dir++)
-	{
-		LLVOWater* waterp = mEdgeWaterObjects[dir];
-		if (waterp && waterp->mDrawable)
-		{
-            waterp->mDrawable->setVisible(camera);
-		    cull->pushDrawable(waterp->mDrawable);
-		}
-	}
-}
-
 void LLWorld::clearHoleWaterObjects()
 {
     for (std::list<LLPointer<LLVOWater> >::iterator iter = mHoleWaterObjects.begin();