diff options
| author | McCabe Maxsted | 2009-09-14 17:52:41 -0700 |
|---|---|---|
| committer | McCabe Maxsted | 2009-09-14 17:52:41 -0700 |
| commit | 7f090f7bec5264ca9e203c27dfb6b2992bb2bcbd (patch) | |
| tree | 0243666021de3ae6ac61a6c6f4e57d42771fe964 /linden/indra/newview/pipeline.cpp | |
| parent | Applied BlockClickSit debug setting from Emerald to block sit click action (diff) | |
| download | meta-impy-7f090f7bec5264ca9e203c27dfb6b2992bb2bcbd.zip meta-impy-7f090f7bec5264ca9e203c27dfb6b2992bb2bcbd.tar.gz meta-impy-7f090f7bec5264ca9e203c27dfb6b2992bb2bcbd.tar.bz2 meta-impy-7f090f7bec5264ca9e203c27dfb6b2992bb2bcbd.tar.xz | |
Merged in jacek/next
Diffstat (limited to 'linden/indra/newview/pipeline.cpp')
| -rw-r--r-- | linden/indra/newview/pipeline.cpp | 9 |
1 files changed, 7 insertions, 2 deletions
diff --git a/linden/indra/newview/pipeline.cpp b/linden/indra/newview/pipeline.cpp index 87b810c..67af961 100644 --- a/linden/indra/newview/pipeline.cpp +++ b/linden/indra/newview/pipeline.cpp | |||
| @@ -1795,8 +1795,13 @@ void LLPipeline::stateSort(LLDrawable* drawablep, LLCamera& camera) | |||
| 1795 | 1795 | ||
| 1796 | if (gHideSelectedObjects) | 1796 | if (gHideSelectedObjects) |
| 1797 | { | 1797 | { |
| 1798 | if (drawablep->getVObj().notNull() && | 1798 | // if (drawablep->getVObj().notNull() && |
| 1799 | drawablep->getVObj()->isSelected()) | 1799 | // drawablep->getVObj()->isSelected()) |
| 1800 | // [RLVa:KB] - Checked: 2009-07-06 (RLVa-1.0.0c) | ||
| 1801 | LLViewerObject* pObj = drawablep->getVObj(); | ||
| 1802 | if ( (pObj) && (pObj->isSelected()) && | ||
| 1803 | ((!rlv_handler_t::isEnabled()) || (!pObj->isHUDAttachment()) || (gRlvHandler.isDetachable(pObj))) ) | ||
| 1804 | // [/RVLa:KB] | ||
| 1800 | { | 1805 | { |
| 1801 | return; | 1806 | return; |
| 1802 | } | 1807 | } |