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 | |
| parent | f4a7de3bb5a837df43525ac936000fd67177ea42 (diff) | |
| parent | 2f4174692e91768ad1302fbfadb5e12fb8670da3 (diff) | |
merge
Diffstat (limited to 'indra')
| -rw-r--r-- | indra/llui/llnotifications.cpp | 6 | ||||
| -rw-r--r-- | indra/newview/llfloaterpostcard.cpp | 2 | ||||
| -rw-r--r-- | indra/newview/skins/default/xui/en/panel_login.xml | 1 |
3 files changed, 8 insertions, 1 deletions
diff --git a/indra/llui/llnotifications.cpp b/indra/llui/llnotifications.cpp index ef222bad60..eb8cc3e2c5 100644 --- a/indra/llui/llnotifications.cpp +++ b/indra/llui/llnotifications.cpp @@ -81,6 +81,11 @@ private: void savePersistentNotifications() { + /* NOTE: As of 2009-11-09 the reload of notifications on startup does not + work, and has not worked for months. Skip saving notifications until the + read can be fixed, because this hits the disk once per notification and + causes log spam. James + llinfos << "Saving open notifications to " << mFileName << llendl; llofstream notify_file(mFileName.c_str()); @@ -107,6 +112,7 @@ private: LLPointer<LLSDFormatter> formatter = new LLSDXMLFormatter(); formatter->format(output, notify_file, LLSDFormatter::OPTIONS_PRETTY); + */ } void loadPersistentNotifications() 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" |