diff options
| author | Andrey Lihatskiy <alihatskiy@productengine.com> | 2024-10-16 12:04:56 +0300 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2024-10-16 12:04:56 +0300 |
| commit | 7ede65bd22ca58253348335fe0d3b489b136ec5e (patch) | |
| tree | 78681b7988bdd672759aba85193ae8dc7692a1d1 /indra/llui | |
| parent | 7547530ad1ff176513701fd4337ff0ce6569fac4 (diff) | |
| parent | 401f7eecb5c011a330046ac125ce14562de7ab5e (diff) | |
Merge pull request #2862 from Ansariel/marchcat/c-develop
Fix various merge issues
Diffstat (limited to 'indra/llui')
| -rw-r--r-- | indra/llui/llfolderviewitem.cpp | 4 |
1 files changed, 0 insertions, 4 deletions
diff --git a/indra/llui/llfolderviewitem.cpp b/indra/llui/llfolderviewitem.cpp index 477e0bc492..eff276d8c6 100644 --- a/indra/llui/llfolderviewitem.cpp +++ b/indra/llui/llfolderviewitem.cpp @@ -200,10 +200,6 @@ LLFolderViewItem::LLFolderViewItem(const LLFolderViewItem::Params& p) { mViewModelItem->setFolderViewItem(this); } - if (mViewModelItem) - { - mViewModelItem->setFolderViewItem(this); - } } // Destroys the object |