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.h | |
| parent | dc1453af9c474c67749aded576c11dff3afdd444 (diff) | |
Fix merge-related compile errors
Diffstat (limited to 'indra/newview/lllocalbitmaps.h')
| -rw-r--r-- | indra/newview/lllocalbitmaps.h | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/indra/newview/lllocalbitmaps.h b/indra/newview/lllocalbitmaps.h index f6cc1e919e..d5ee7efdc6 100644 --- a/indra/newview/lllocalbitmaps.h +++ b/indra/newview/lllocalbitmaps.h @@ -120,6 +120,7 @@ public: bool checkTextureDimensions(std::string filename); LLUUID getWorldID(LLUUID tracking_id); + bool isLocal(LLUUID world_id); std::string getFilename(LLUUID tracking_id); void feedScrollList(LLScrollListCtrl* ctrl); |