Merge branch 'next' of git://github.com/jacek/imprudence into next

Conflicts (manually merged the grids, ignored the other two):
	linden/indra/newview/app_settings/default_grids.xml
	linden/indra/newview/llvoavatar.cpp
	linden/indra/newview/skins/default/xui/en-us/panel_login.xml

1 files changed, 0 insertions, 3 deletions

diff --git a/linden/indra/newview/llprefscolors.h b/linden/indra/newview/llprefscolors.h
index d580add..88ea371 100644
--- a/linden/indra/newview/llprefscolors.h
+++ b/linden/indra/newview/llprefscolors.h
@@ -47,11 +47,9 @@ public:
 private:
         static void onCommitCheckSelfName(LLUICtrl* ctrl, void* userdata);
         static void onCommitCheckFriends(LLUICtrl* ctrl, void* userdata);
-        static void onCommitCheckClient(LLUICtrl* ctrl, void* userdata);
         void refreshColors();
         void updateFriendsCheck();
         void updateSelfCheck();
-        void updateClientCheck();
 
         LLColor4 mSystemChatColor;
         LLColor4 mUserChatColor;
@@ -65,7 +63,6 @@ private:
         LLColor4 mFriendsChatColor;
         LLColor4 mOwnNameChatColor;
         LLColor4 mEffectColor;
-        LLColor4 mClientTagColor;
 };
 
 #endif //LLPREFSCOLORS_H