More updates to preferences UI and bug fixes.

2011-05-28 21:31:35 -04:00
parent 139a3d35bb
commit da23cd1f42
6 changed files with 292 additions and 274 deletions
--- a/indra/newview/ascentprefschat.h
+++ b/indra/newview/ascentprefschat.h
@@ -53,6 +53,7 @@ protected:
    static void onSpellGetMore(void* data);
    static void onSpellEditCustom(void* data);
    static void onSpellBaseComboBoxCommit(LLUICtrl* ctrl, void* userdata);
+    static void onCommitTimeDate(LLUICtrl* ctrl, void *userdata);
 	static void onCommitAutoResponse(LLUICtrl* ctrl, void* user_data);
 	static void onCommitKeywords(LLUICtrl* ctrl, void* user_data);

@@ -68,6 +69,8 @@ protected:
    U32 mLinksForChattingObjects;
    U32 mTimeFormat;
 	U32 mDateFormat;
+        U32 tempTimeFormat;
+        U32 tempDateFormat;
    BOOL mSecondsInChatAndIMs;

    BOOL mIMResponseAnyone;