diff options
| author | Cosmic Linden <cosmic@lindenlab.com> | 2022-11-29 14:23:18 -0800 |
|---|---|---|
| committer | Cosmic Linden <cosmic@lindenlab.com> | 2022-11-29 14:23:18 -0800 |
| commit | cf86c23dfe1fd732cd939b7fd48fdc7b88bdce1c (patch) | |
| tree | 8c6fde0380c8818d233994ebed43843e2b643474 /indra/newview | |
| parent | 361571cdb330dea18ad5a3575d7b06c69371e11b (diff) | |
SL-18732: Pass material list callbacks by reference
Diffstat (limited to 'indra/newview')
| -rw-r--r-- | indra/newview/llgltfmateriallist.cpp | 12 |
1 files changed, 5 insertions, 7 deletions
diff --git a/indra/newview/llgltfmateriallist.cpp b/indra/newview/llgltfmateriallist.cpp index 8142762dfe..048085fb71 100644 --- a/indra/newview/llgltfmateriallist.cpp +++ b/indra/newview/llgltfmateriallist.cpp @@ -229,8 +229,6 @@ public: bool mSuccess; }; - std::vector<void(*)(const LLUUID& object_id, S32 side)> callbacks = mCallbacks; - // fromJson() is performance heavy offload to a thread. main_queue->postTo( general_queue, @@ -270,7 +268,7 @@ public: } return results; }, - [object_override, callbacks](std::vector<ReturnData> results) // Callback to main thread + [object_override, this](std::vector<ReturnData> results) // Callback to main thread { LLViewerObject * obj = gObjectList.findObject(object_override.mObjectId); @@ -293,7 +291,7 @@ public: } else if (obj && obj->isAnySelected()) { - for (auto& override_update_callback : callbacks) + for (auto& override_update_callback : mCallbacks) { override_update_callback(object_override.mObjectId, results[i].mSide); } @@ -304,7 +302,7 @@ public: // unblock material editor if (obj && obj->isAnySelected()) { - for (auto& override_update_callback : callbacks) + for (auto& override_update_callback : mCallbacks) { override_update_callback(object_override.mObjectId, results[i].mSide); } @@ -322,7 +320,7 @@ public: obj->setTEGLTFMaterialOverride(i, nullptr); if (object_has_selection) { - for (auto& override_update_callback : callbacks) + for (auto& override_update_callback : mCallbacks) { override_update_callback(object_override.mObjectId, i); } @@ -339,7 +337,7 @@ public: obj->setTEGLTFMaterialOverride(i, nullptr); if (object_has_selection) { - for (auto& override_update_callback : callbacks) + for (auto& override_update_callback : mCallbacks) { override_update_callback(obj->getID(), i); } |