summaryrefslogtreecommitdiff
path: root/indra/newview
diff options
context:
space:
mode:
authorLynx Linden <lynx@lindenlab.com>2010-01-15 19:26:13 +0000
committerLynx Linden <lynx@lindenlab.com>2010-01-15 19:26:13 +0000
commitc2172dab65505dcf47763cd2d7a7c32f4ff5f525 (patch)
tree5889633c2999f5b7292067ab591c06182b9f81a2 /indra/newview
parent1d1f51db971271c42d68fa12032d6f85a7e35bd8 (diff)
parent988cc62d3026680362b76e017a441f40b9cedc6d (diff)
Automated merge with ssh://hg.lindenlab.com/viewer/viewer-2-0/
Diffstat (limited to 'indra/newview')
-rw-r--r--indra/newview/tests/llviewerhelputil_test.cpp3
1 files changed, 3 insertions, 0 deletions
diff --git a/indra/newview/tests/llviewerhelputil_test.cpp b/indra/newview/tests/llviewerhelputil_test.cpp
index d7dd199722..297d98ad8d 100644
--- 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;