diff options
author | Jacek Antonelli | 2008-09-06 18:24:57 -0500 |
---|---|---|
committer | Jacek Antonelli | 2008-09-06 18:25:07 -0500 |
commit | 798d367d54a6c6379ad355bd8345fa40e31e7fe9 (patch) | |
tree | 1921f1708cd0240648c97bc02df2c2ab5f2fc41e /linden/indra/newview/llpaneldisplay.h | |
parent | Second Life viewer sources 1.20.15 (diff) | |
download | meta-impy-798d367d54a6c6379ad355bd8345fa40e31e7fe9.zip meta-impy-798d367d54a6c6379ad355bd8345fa40e31e7fe9.tar.gz meta-impy-798d367d54a6c6379ad355bd8345fa40e31e7fe9.tar.bz2 meta-impy-798d367d54a6c6379ad355bd8345fa40e31e7fe9.tar.xz |
Second Life viewer sources 1.21.0-RC
Diffstat (limited to '')
-rw-r--r-- | linden/indra/newview/llpaneldisplay.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/linden/indra/newview/llpaneldisplay.h b/linden/indra/newview/llpaneldisplay.h index e100a18..4b0d9d7 100644 --- a/linden/indra/newview/llpaneldisplay.h +++ b/linden/indra/newview/llpaneldisplay.h | |||
@@ -77,7 +77,7 @@ public: | |||
77 | 77 | ||
78 | protected: | 78 | protected: |
79 | void initWindowSizeControls(); | 79 | void initWindowSizeControls(); |
80 | bool extractWindowSizeFromString(const char *sInput, U32 &width, U32 &height); | 80 | bool extractWindowSizeFromString(const std::string& instr, U32 &width, U32 &height); |
81 | 81 | ||
82 | // aspect ratio sliders and boxes | 82 | // aspect ratio sliders and boxes |
83 | LLComboBox *mCtrlFullScreen; // Fullscreen resolution | 83 | LLComboBox *mCtrlFullScreen; // Fullscreen resolution |