diff options
| author | David Walter Seikel | 2013-07-15 03:59:58 +1000 |
|---|---|---|
| committer | David Walter Seikel | 2013-07-15 03:59:58 +1000 |
| commit | c7f06e9e63a54874696fe89e2ef24c809bef51f3 (patch) | |
| tree | 3eb207f344435fbeb82b142000980416d50690cd /linden/indra/llui/llui.h | |
| parent | More Windlight refactoring, including moving the new stuff back to lightshare.c. (diff) | |
| parent | Fix Align tool conflicts with Edit Linked Parts - http://redmine.kokuaviewer.... (diff) | |
| download | meta-impy-c7f06e9e63a54874696fe89e2ef24c809bef51f3.zip meta-impy-c7f06e9e63a54874696fe89e2ef24c809bef51f3.tar.gz meta-impy-c7f06e9e63a54874696fe89e2ef24c809bef51f3.tar.bz2 meta-impy-c7f06e9e63a54874696fe89e2ef24c809bef51f3.tar.xz | |
Merge remote-tracking branch 'origin/next' into WL-refactor
Diffstat (limited to 'linden/indra/llui/llui.h')
| -rw-r--r-- | linden/indra/llui/llui.h | 2 |
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 | ||