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/llinventory | |
| parent | 7547530ad1ff176513701fd4337ff0ce6569fac4 (diff) | |
| parent | 401f7eecb5c011a330046ac125ce14562de7ab5e (diff) | |
Merge pull request #2862 from Ansariel/marchcat/c-develop
Fix various merge issues
Diffstat (limited to 'indra/llinventory')
| -rw-r--r-- | indra/llinventory/llinventory.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/indra/llinventory/llinventory.cpp b/indra/llinventory/llinventory.cpp index 14abf76eb9..16c112d411 100644 --- a/indra/llinventory/llinventory.cpp +++ b/indra/llinventory/llinventory.cpp @@ -1029,7 +1029,7 @@ bool LLInventoryItem::fromLLSD(const LLSD& sd, bool is_new) <integer> 1 </key> */ continue; - } + } if (i->first == INV_THUMBNAIL_ID_LABEL) { |