diff options
| author | Steven Bennetts <steve@lindenlab.com> | 2008-08-28 23:57:41 +0000 |
|---|---|---|
| committer | Steven Bennetts <steve@lindenlab.com> | 2008-08-28 23:57:41 +0000 |
| commit | 4a6bacea0f8dcff959028f285bc533852da608b5 (patch) | |
| tree | 7f49b429051e550f70917ccbcdd1c27bf86f5bdf /indra/llrender/llgl.h | |
| parent | ac4766d4354ee1945f1569a94d755e3e7c0cd566 (diff) | |
merge viewer/viewer_1-21 94170-94770 -> release
merge viewer/viewer_1-21-0 94830-95157 -> release
Includes:
QAR-786 Sandbox buildme for viewer + server Release Notes on the wiki!
QAR-797 teleport failures (DEV-6198 / SVC-972) mergeme
Diffstat (limited to 'indra/llrender/llgl.h')
| -rw-r--r-- | indra/llrender/llgl.h | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/indra/llrender/llgl.h b/indra/llrender/llgl.h index cff54cc342..bab5e5245f 100644 --- a/indra/llrender/llgl.h +++ b/indra/llrender/llgl.h @@ -223,9 +223,9 @@ public: static void resetTextureStates(); static void dumpStates(); - static void checkStates(); - static void checkTextureChannels(); - static void checkClientArrays(U32 data_mask = 0x0001); + static void checkStates(const std::string& msg = ""); + static void checkTextureChannels(const std::string& msg = ""); + static void checkClientArrays(const std::string& msg = "", U32 data_mask = 0x0001); protected: static std::map<LLGLenum, LLGLboolean> sStateMap; |