diff options
| author | Euclid Linden <euclid@lindenlab.com> | 2021-07-19 22:24:33 +0000 |
|---|---|---|
| committer | Euclid Linden <euclid@lindenlab.com> | 2021-07-19 22:24:33 +0000 |
| commit | 1b15b8cda7853e55a91fd0140311ed69f3cca677 (patch) | |
| tree | 33edfb0495161594a50dcfbed3a3f42e7fde9143 /indra/llrender/llrender2dutils.h | |
| parent | dc14dbf54d332a6cdc43002bb71ed71e9a473647 (diff) | |
| parent | 4c849ba91363f82da05cce1221b04075a6ca72af (diff) | |
Merged in DV528-merge-6.4.22 (pull request #630)
DRTVWR-528 merge up to v 6.4.22
Diffstat (limited to 'indra/llrender/llrender2dutils.h')
| -rw-r--r-- | indra/llrender/llrender2dutils.h | 13 |
1 files changed, 5 insertions, 8 deletions
diff --git a/indra/llrender/llrender2dutils.h b/indra/llrender/llrender2dutils.h index 8c01784071..206e68f084 100644 --- a/indra/llrender/llrender2dutils.h +++ b/indra/llrender/llrender2dutils.h @@ -128,19 +128,16 @@ class LLRender2D : public LLParamSingleton<LLRender2D> LOG_CLASS(LLRender2D); ~LLRender2D(); public: - void pushMatrix(); - void popMatrix(); - void loadIdentity(); - void translate(F32 x, F32 y, F32 z = 0.0f); + static void pushMatrix(); + static void popMatrix(); + static void loadIdentity(); + static void translate(F32 x, F32 y, F32 z = 0.0f); - void setLineWidth(F32 width); - void setScaleFactor(const LLVector2& scale_factor); + static void setLineWidth(F32 width); LLPointer<LLUIImage> getUIImageByID(const LLUUID& image_id, S32 priority = 0); LLPointer<LLUIImage> getUIImage(const std::string& name, S32 priority = 0); - LLVector2 mGLScaleFactor; - protected: // since LLRender2D has no control of image provider's lifecycle // we need a way to tell LLRender2D that provider died and |