diff options
author | Oz Linden <oz@lindenlab.com> | 2014-08-13 17:58:01 -0400 |
---|---|---|
committer | Oz Linden <oz@lindenlab.com> | 2014-08-13 17:58:01 -0400 |
commit | 383edf8015743becc37650ab018a112b9ff347b1 (patch) | |
tree | 1e9a33f1517c6fff3416f5426de525628f1d29c2 /indra/newview/lllocalbitmaps.h | |
parent | d56958e68934e673195ec2966e0a3c20dac7fb41 (diff) | |
parent | 06b605b8666f2336e77126f8ff47765115c08a27 (diff) |
merge changes for MAINT-4356
Diffstat (limited to 'indra/newview/lllocalbitmaps.h')
-rwxr-xr-x | 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 a15ea10801..59467922b4 100755 --- a/indra/newview/lllocalbitmaps.h +++ b/indra/newview/lllocalbitmaps.h @@ -120,6 +120,7 @@ class LLLocalBitmapMgr static void cleanupClass(); static bool addUnit(); static void delUnit(LLUUID tracking_id); + static bool checkTextureDimensions(std::string filename); static LLUUID getWorldID(LLUUID tracking_id); static std::string getFilename(LLUUID tracking_id); |