Automated merge with ssh://hg.lindenlab.com/viewer/viewer-2-0/

2010-01-15 19:26:13 +00:00 · 2010-01-15 19:26:13 +00:00 · c2172dab65
parent 1d1f51db97 988cc62d30
commit c2172dab65
1 changed files with 3 additions and 0 deletions
--- a/indra/newview/tests/llviewerhelputil_test.cpp
+++ b/indra/newview/tests/llviewerhelputil_test.cpp
@ -83,6 +83,9 @@ class LLAgent
 public:
 	LLAgent() {}
 	~LLAgent() {}
+#ifdef __GNUC__
+	__attribute__ ((noinline))
+#endif
 	BOOL isGodlike() const { return FALSE; }
 private:
 	int dummy;