summaryrefslogtreecommitdiff
path: root/indra
diff options
context:
space:
mode:
authorGraham Madarasz <graham@lindenlab.com>2013-05-23 11:40:45 -0700
committerGraham Madarasz <graham@lindenlab.com>2013-05-23 11:40:45 -0700
commit33f674a0d080c5e74ae2f50029b601b4dcecd4d9 (patch)
tree0328dd8cfc97bf48f053ca8d4a41a6d44ed9b43f /indra
parent9030ecec062cd31ffa6eeffc409eeccb0ad4baa5 (diff)
NORSPEC-208 re-enable TE-specific material mgr registration to avoid cross-talk when editing faces
Diffstat (limited to 'indra')
-rw-r--r--indra/newview/llmaterialmgr.h2
1 files changed, 2 insertions, 0 deletions
diff --git a/indra/newview/llmaterialmgr.h b/indra/newview/llmaterialmgr.h
index 9b3d7a0246..0c030623ba 100644
--- a/indra/newview/llmaterialmgr.h
+++ b/indra/newview/llmaterialmgr.h
@@ -31,6 +31,8 @@
#include "llmaterialid.h"
#include "llsingleton.h"
+#define USE_TE_SPECIFIC_REGISTRATION 1
+
class LLViewerRegion;
class LLMaterialMgr : public LLSingleton<LLMaterialMgr>