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/newview/llinventorybridge.cpp | |
| parent | 7547530ad1ff176513701fd4337ff0ce6569fac4 (diff) | |
| parent | 401f7eecb5c011a330046ac125ce14562de7ab5e (diff) | |
Merge pull request #2862 from Ansariel/marchcat/c-develop
Fix various merge issues
Diffstat (limited to 'indra/newview/llinventorybridge.cpp')
| -rw-r--r-- | indra/newview/llinventorybridge.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/indra/newview/llinventorybridge.cpp b/indra/newview/llinventorybridge.cpp index 7b975a2154..9a38355858 100644 --- a/indra/newview/llinventorybridge.cpp +++ b/indra/newview/llinventorybridge.cpp @@ -2310,7 +2310,7 @@ bool LLItemBridge::isFavorite() const { LLViewerInventoryItem* item = NULL; LLInventoryModel* model = getInventoryModel(); - if(model) + if (model) { item = model->getItem(mUUID); } |