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/llfloaterenvsettings.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 'linden/indra/newview/llfloaterenvsettings.h')
-rw-r--r-- | linden/indra/newview/llfloaterenvsettings.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/linden/indra/newview/llfloaterenvsettings.h b/linden/indra/newview/llfloaterenvsettings.h index 63f6a98..8f70993 100644 --- a/linden/indra/newview/llfloaterenvsettings.h +++ b/linden/indra/newview/llfloaterenvsettings.h | |||
@@ -95,7 +95,7 @@ public: | |||
95 | void syncMenu(); | 95 | void syncMenu(); |
96 | 96 | ||
97 | /// convert the present time to a digital clock time | 97 | /// convert the present time to a digital clock time |
98 | LLString timeToString(F32 curTime); | 98 | std::string timeToString(F32 curTime); |
99 | 99 | ||
100 | private: | 100 | private: |
101 | // one instance on the inside | 101 | // one instance on the inside |