diff options
| author | Graham Madarasz (Graham Linden) <graham@lindenlab.com> | 2013-03-14 14:18:54 -0700 |
|---|---|---|
| committer | Graham Madarasz (Graham Linden) <graham@lindenlab.com> | 2013-03-14 14:18:54 -0700 |
| commit | 2dcc0a9907f59854d8b0d28de188d60a9a354e23 (patch) | |
| tree | 9025a28e4f50a2246ce1901899d654a28336e99d /indra | |
| parent | e8dfa28697c177e8ed08ff76a9b81f920805a92f (diff) | |
| parent | 85257154a3ba001ecadacf4d81baa6f9c187a041 (diff) | |
Merge
Diffstat (limited to 'indra')
| -rw-r--r-- | indra/llui/lllayoutstack.cpp | 1 | ||||
| -rw-r--r-- | indra/newview/llvovolume.cpp | 2 |
2 files changed, 2 insertions, 1 deletions
diff --git a/indra/llui/lllayoutstack.cpp b/indra/llui/lllayoutstack.cpp index 3adc1a6c70..13c143b22f 100644 --- a/indra/llui/lllayoutstack.cpp +++ b/indra/llui/lllayoutstack.cpp @@ -855,3 +855,4 @@ void LLLayoutStack::updateResizeBarLimits() previous_visible_panelp = visible_panelp; } } + diff --git a/indra/newview/llvovolume.cpp b/indra/newview/llvovolume.cpp index 9dcdd467e7..e0ed13a3a7 100644 --- a/indra/newview/llvovolume.cpp +++ b/indra/newview/llvovolume.cpp @@ -1299,7 +1299,7 @@ BOOL LLVOVolume::calcLOD() if (gPipeline.hasRenderDebugMask(LLPipeline::RENDER_DEBUG_LOD_INFO) && mDrawable->getFace(0)) { - setDebugText(llformat("%.2f:%.2f, %d", mDrawable->mDistanceWRTCamera, radius, cur_detail)); + //setDebugText(llformat("%.2f:%.2f, %d", debug_distance, radius, cur_detail)); //setDebugText(llformat("%d", mDrawable->getFace(0)->getTextureIndex())); } |