aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/linden/indra/llui/llui.h
diff options
context:
space:
mode:
authorDavid Walter Seikel2014-02-03 15:23:22 +1000
committerDavid Walter Seikel2014-02-03 15:23:22 +1000
commitd056a17f05a1f90708f554651475e116a2ddbd68 (patch)
tree07fa4f1cca2a25548b8d2d6b4752b07d8efbd2ff /linden/indra/llui/llui.h
parentUpdating tree and volume LOD. These go to eleven. (diff)
parentFix up OTR prefs to not crash. (diff)
downloadmeta-impy-d056a17f05a1f90708f554651475e116a2ddbd68.zip
meta-impy-d056a17f05a1f90708f554651475e116a2ddbd68.tar.gz
meta-impy-d056a17f05a1f90708f554651475e116a2ddbd68.tar.bz2
meta-impy-d056a17f05a1f90708f554651475e116a2ddbd68.tar.xz
Merge branch 'next' of github.com:onefang/meta-impy into nextHEADnext
Diffstat (limited to 'linden/indra/llui/llui.h')
-rw-r--r--linden/indra/llui/llui.h2
1 files changed, 2 insertions, 0 deletions
diff --git a/linden/indra/llui/llui.h b/linden/indra/llui/llui.h
index ebcc730..466d2c7 100644
--- a/linden/indra/llui/llui.h
+++ b/linden/indra/llui/llui.h
@@ -706,10 +706,12 @@ public:
706 706
707 // this avoids a MSVC bug where non-referenced static members are "optimized" away 707 // this avoids a MSVC bug where non-referenced static members are "optimized" away
708 // even if their constructors have side effects 708 // even if their constructors have side effects
709 // Then we avoid a compiler warning that dummy is never used. lol
709 void reference() 710 void reference()
710 { 711 {
711 S32 dummy; 712 S32 dummy;
712 dummy = 0; 713 dummy = 0;
714 dummy = dummy + 0;
713 } 715 }
714}; 716};
715 717