diff options
| author | Xiaohong Bao <bao@lindenlab.com> | 2013-10-22 15:47:50 -0600 | 
|---|---|---|
| committer | Xiaohong Bao <bao@lindenlab.com> | 2013-10-22 15:47:50 -0600 | 
| commit | e46c4fd1c6f8d99e87fd53e71d97fb8ce925a576 (patch) | |
| tree | 9c80f2e02585f7ef789c57bd8e4dd7a9227989f6 /indra/newview | |
| parent | 0c60e3280866d0d9692b71166c93a2f6cda06f58 (diff) | |
trivial: convert to unix endings.
Diffstat (limited to 'indra/newview')
| -rw-r--r-- | indra/newview/llvieweroctree.cpp | 32 | 
1 files changed, 16 insertions, 16 deletions
| diff --git a/indra/newview/llvieweroctree.cpp b/indra/newview/llvieweroctree.cpp index af6f8bdede..993967ee94 100644 --- a/indra/newview/llvieweroctree.cpp +++ b/indra/newview/llvieweroctree.cpp @@ -761,22 +761,22 @@ public:  	}  protected: -
 -	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);
 + +	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);  	}  }; | 
