diff options
| author | Dave Houlton <euclid@lindenlab.com> | 2019-11-14 15:19:55 -0700 |
|---|---|---|
| committer | Dave Houlton <euclid@lindenlab.com> | 2019-11-14 15:19:55 -0700 |
| commit | e9c0a93f99c4e6a4844da1a93ac261c4b206b79b (patch) | |
| tree | 5efd1b87123998a25d0aeb8a33232aae64fff284 /indra/newview/lllocalbitmaps.cpp | |
| parent | dc1453af9c474c67749aded576c11dff3afdd444 (diff) | |
Fix merge-related compile errors
Diffstat (limited to 'indra/newview/lllocalbitmaps.cpp')
| -rw-r--r-- | indra/newview/lllocalbitmaps.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/indra/newview/lllocalbitmaps.cpp b/indra/newview/lllocalbitmaps.cpp index 3c667c2219..5a17332fde 100644 --- a/indra/newview/lllocalbitmaps.cpp +++ b/indra/newview/lllocalbitmaps.cpp @@ -1040,7 +1040,7 @@ LLUUID LLLocalBitmapMgr::getWorldID(LLUUID tracking_id) bool LLLocalBitmapMgr::isLocal(const LLUUID world_id) { - for (local_list_iter iter = sBitmapList.begin(); iter != sBitmapList.end(); iter++) + for (local_list_iter iter = mBitmapList.begin(); iter != mBitmapList.end(); iter++) { LLLocalBitmap* unit = *iter; if (unit->getWorldID() == world_id) |