diff options
| author | andreykproductengine <akleshchev@productengine.com> | 2015-08-04 20:44:28 +0300 |
|---|---|---|
| committer | andreykproductengine <akleshchev@productengine.com> | 2015-08-04 20:44:28 +0300 |
| commit | 3e11b8c9172b6967ee9734de2d0493480d483b76 (patch) | |
| tree | 7c10dc25382d842b98eaaf9c251c96d898fe3d12 /indra/newview/llviewerassettype.cpp | |
| parent | 666b9346bac49a43ee92390d2dc6cae3ea91cf22 (diff) | |
merge conflict fix (isDead() check got missed)
Diffstat (limited to 'indra/newview/llviewerassettype.cpp')
0 files changed, 0 insertions, 0 deletions