diff options
author | Mark Palange (Mani) <palange@lindenlab.com> | 2009-06-23 18:29:59 -0700 |
---|---|---|
committer | Mark Palange (Mani) <palange@lindenlab.com> | 2009-06-23 18:29:59 -0700 |
commit | 33c230b46d17a2064994991763643a239e12e2c2 (patch) | |
tree | 3af380efd9b3f67b26cc8b3c9c5a0fdd1549dd6d /indra/newview/llpanellogin.cpp | |
parent | 9b86d4c12f5f29d0bca5354d4e1ac6b5c828a327 (diff) |
A few more merge error fixes.
Diffstat (limited to 'indra/newview/llpanellogin.cpp')
-rw-r--r-- | indra/newview/llpanellogin.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/indra/newview/llpanellogin.cpp b/indra/newview/llpanellogin.cpp index 75df49e5e3..9afb8468ef 100644 --- a/indra/newview/llpanellogin.cpp +++ b/indra/newview/llpanellogin.cpp @@ -432,7 +432,7 @@ BOOL LLPanelLogin::handleKeyHere(KEY key, MASK mask) if ( KEY_F2 == key ) { llinfos << "Spawning floater TOS window" << llendl; - LLFloaterTOS* tos_dialog = LLFloaterTOS::show(LLFloaterTOS::TOS_TOS,""); + LLFloaterTOS* tos_dialog = LLFloaterTOS::show(LLFloaterTOS::TOS_TOS,"", 0); tos_dialog->startModal(); return TRUE; } |