diff options
| author | Xiaohong Bao <bao@lindenlab.com> | 2013-05-23 18:26:14 -0600 |
|---|---|---|
| committer | Xiaohong Bao <bao@lindenlab.com> | 2013-05-23 18:26:14 -0600 |
| commit | 774544bc51ce365f7fd37e7d51210f290b546cf2 (patch) | |
| tree | cf3cf3ab23ddd28402564ec3e32635e3c1e81fdc /indra/newview/llscenemonitor.cpp | |
| parent | 2cdd6c2749b6553f8081e25e426501acd4025888 (diff) | |
| parent | 16616ae48d86da75b3809fa6be6c846a9d420603 (diff) | |
Automated merge with ssh://hg.lindenlab.com/richard/viewer-interesting
Diffstat (limited to 'indra/newview/llscenemonitor.cpp')
| -rw-r--r-- | indra/newview/llscenemonitor.cpp | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/indra/newview/llscenemonitor.cpp b/indra/newview/llscenemonitor.cpp index 94c2e40bb1..f744a924f5 100644 --- a/indra/newview/llscenemonitor.cpp +++ b/indra/newview/llscenemonitor.cpp @@ -102,7 +102,7 @@ void LLSceneMonitor::reset() if(mQueryObject > 0) { - release_occlusion_query_object_name(mQueryObject); + LLOcclusionCullingGroup::releaseOcclusionQueryObjectName(mQueryObject); mQueryObject = 0; } } @@ -421,7 +421,7 @@ void LLSceneMonitor::calcDiffAggregate() if(!mQueryObject) { - mQueryObject = get_new_occlusion_query_object_name(); + mQueryObject = LLOcclusionCullingGroup::getNewOcclusionQueryObjectName(); } LLGLDepthTest depth(true, false, GL_ALWAYS); |