diff options
author | Andrey Lihatskiy <alihatskiy@productengine.com> | 2022-08-31 00:17:37 +0300 |
---|---|---|
committer | Andrey Lihatskiy <alihatskiy@productengine.com> | 2022-08-31 00:17:37 +0300 |
commit | a9a63db0f08bcf5c2593bc8b6c7ab6e532376988 (patch) | |
tree | 6a246a607b5b4c3fb15f1d0826a468c6b57c5d4b /indra/newview/lllocalbitmaps.h | |
parent | e3ef38876b9951af3ea8052fb02db46212c76965 (diff) | |
parent | d31a83fb946c49a38376ea3b312b5380d0c8c065 (diff) |
Merge branch 'master' into DRTVWR-548-maint-N
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 def5a6bd6e..02b8834c16 100644 --- a/indra/newview/lllocalbitmaps.h +++ b/indra/newview/lllocalbitmaps.h @@ -116,6 +116,7 @@ class LLLocalBitmapMgr : public LLSingleton<LLLocalBitmapMgr> ~LLLocalBitmapMgr(); public: bool addUnit(); + LLUUID addUnit(const std::string &filename); void delUnit(LLUUID tracking_id); bool checkTextureDimensions(std::string filename); |