diff options
| author | James Cook <james@lindenlab.com> | 2009-11-09 16:04:48 -0800 |
|---|---|---|
| committer | James Cook <james@lindenlab.com> | 2009-11-09 16:04:48 -0800 |
| commit | 116f1601bd12f0a60373f4b69d71130ee50417f1 (patch) | |
| tree | 8fefd636a051148179189a7fb54b8d9ceec3f0ff /indra/newview | |
| parent | f4a7de3bb5a837df43525ac936000fd67177ea42 (diff) | |
| parent | 2f4174692e91768ad1302fbfadb5e12fb8670da3 (diff) | |
merge
Diffstat (limited to 'indra/newview')
| -rw-r--r-- | indra/newview/llfloaterpostcard.cpp | 2 | ||||
| -rw-r--r-- | indra/newview/skins/default/xui/en/panel_login.xml | 1 |
2 files changed, 2 insertions, 1 deletions
diff --git a/indra/newview/llfloaterpostcard.cpp b/indra/newview/llfloaterpostcard.cpp index 938370b732..ae1a99e5fc 100644 --- a/indra/newview/llfloaterpostcard.cpp +++ b/indra/newview/llfloaterpostcard.cpp @@ -291,7 +291,7 @@ void LLFloaterPostcard::uploadCallback(const LLUUID& asset_id, void *user_data, // static void LLFloaterPostcard::updateUserInfo(const std::string& email) { - LLFloaterReg::const_instance_list_t& inst_list = LLFloaterReg::getFloaterList("impanel"); + LLFloaterReg::const_instance_list_t& inst_list = LLFloaterReg::getFloaterList("postcard"); for (LLFloaterReg::const_instance_list_t::const_iterator iter = inst_list.begin(); iter != inst_list.end(); ++iter) { diff --git a/indra/newview/skins/default/xui/en/panel_login.xml b/indra/newview/skins/default/xui/en/panel_login.xml index 1646cba0a7..cb5ec15387 100644 --- a/indra/newview/skins/default/xui/en/panel_login.xml +++ b/indra/newview/skins/default/xui/en/panel_login.xml @@ -51,6 +51,7 @@ </text> <line_editor follows="left|bottom" + font="SansSerif" handle_edit_keys_directly="true" height="20" left_delta="0" |