Merge

1 files changed, 16 insertions, 30 deletions

diff --git a/indra/newview/llvieweroctree.cpp b/indra/newview/llvieweroctree.cpp
index 425e7fbd1f..af6f8bdede 100644
--- a/indra/newview/llvieweroctree.cpp
+++ b/indra/newview/llvieweroctree.cpp
@@ -758,39 +758,25 @@ class LLOcclusionQueryPool : public LLGLNamePool
 public:
 	LLOcclusionQueryPool()
 	{
-		mCurQuery = 1;
 	}
 
 protected:
-
-	std::list<GLuint> mAvailableName;
-	GLuint mCurQuery;
-		
-	virtual GLuint allocateName()
-	{
-		GLuint ret = 0;
-
-		if (!mAvailableName.empty())
-		{
-			ret = mAvailableName.front();
-			mAvailableName.pop_front();
-		}
-		else
-		{
-			ret = mCurQuery++;
-		}
-
-		return ret;
-	}
-
-	virtual void releaseName(GLuint name)
-	{
-#if LL_TRACK_PENDING_OCCLUSION_QUERIES
-		LLSpatialGroup::sPendingQueries.erase(name);
-
-#endif
-		llassert(std::find(mAvailableName.begin(), mAvailableName.end(), name) == mAvailableName.end());
-		mAvailableName.push_back(name);
+

+	virtual GLuint allocateName()

+	{

+		GLuint ret = 0;

+

+		glGenQueriesARB(1, &ret);

+	

+		return ret;

+	}

+

+	virtual void releaseName(GLuint name)

+	{

+#if LL_TRACK_PENDING_OCCLUSION_QUERIES

+		LLOcclusionCullingGroup::sPendingQueries.erase(name);

+#endif

+		glDeleteQueriesARB(1, &name);

 	}
 };