From 4a6bacea0f8dcff959028f285bc533852da608b5 Mon Sep 17 00:00:00 2001 From: Steven Bennetts Date: Thu, 28 Aug 2008 23:57:41 +0000 Subject: 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 --- indra/llrender/llgl.h | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'indra/llrender/llgl.h') 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 sStateMap; -- cgit v1.2.3