Merge branch 'PrefsUpdate'

2011-05-29 20:23:59 -04:00
parent abf5f09a46 3813ccb15a
commit b7a697bcf9
23 changed files with 2092 additions and 1898 deletions
--- a/indra/newview/CMakeLists.txt
+++ b/indra/newview/CMakeLists.txt
@@ -78,6 +78,7 @@ set(viewer_SOURCE_FILES
    ascentdaycyclemanager.cpp
    ascentfloatercontactgroups.cpp
    ascentkeyword.cpp
+    ascentprefschat.cpp
    ascentprefssys.cpp
    ascentprefsvan.cpp
    dhparam.cpp
@@ -552,6 +553,7 @@ set(viewer_HEADER_FILES
    ascentdaycyclemanager.h
    ascentfloatercontactgroups.h
    ascentkeyword.h
+    ascentprefschat.h
    ascentprefssys.h
    ascentprefsvan.h
    emerald.h