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

Conflicts (manually merged):
	linden/indra/llcommon/llversionviewer.h
	linden/indra/llvfs/lldir.cpp
	linden/indra/llvfs/lldir_mac.cpp
	linden/indra/newview/CMakeLists.txt
	linden/indra/newview/English.lproj/InfoPlist.strings
	linden/indra/newview/Info-Imprudence.plist
	linden/indra/newview/Info-meta-impy.plist
	linden/indra/newview/llappviewer.cpp
	linden/indra/newview/llpanellogin.cpp
	linden/indra/newview/packaging/mac/Info.plist.in
	linden/indra/newview/res/viewerRes.rc
	linden/indra/newview/skins/default/xui/en-us/floater_about.xml
	linden/indra/newview/skins/default/xui/en-us/panel_preferences_advanced.xml
	linden/indra/newview/skins/default/xui/en-us/panel_preferences_graphics1.xml
	linden/indra/newview/skins/default/xui/en-us/panel_preferences_im.xml
	linden/indra/newview/skins/default/xui/en-us/panel_preferences_skins.xml
	linden/indra/newview/skins/default/xui/en-us/panel_preferences_web.xml
	linden/indra/newview/skins/default/xui/zh/menu_viewer.xml
	linden/indra/newview/skins/default/xui/zh/panel_group_general.xml
	linden/indra/newview/viewer_manifest.py
	linden/indra/newview/viewerversion.cpp
	linden/indra/newview/viewerversion.h
	linden/install.xml

Also some post merge tweaks.

1 files changed, 3 insertions, 0 deletions

diff --git a/linden/indra/newview/llpanelavatar.cpp b/linden/indra/newview/llpanelavatar.cpp
index 6a3a0bd..e3fe141 100644
--- a/linden/indra/newview/llpanelavatar.cpp
+++ b/linden/indra/newview/llpanelavatar.cpp
@@ -1990,6 +1990,7 @@ void LLPanelAvatar::processAvatarPropertiesReply(LLMessageSystem *msg, void**)
                 LLTextEditor* about_field = self->mPanelSecondLife->getChild<LLTextEditor>("about");
                 if (about_field)
                 {
+                        about_field->clear();
                         if (self->mAllowEdit && (self->mAvatarID == agent_id))
                         {
                                 about_field->setText(about_text);
@@ -2009,8 +2010,10 @@ void LLPanelAvatar::processAvatarPropertiesReply(LLMessageSystem *msg, void**)
                         about_field = self->mPanelFirstLife->getChild<LLTextEditor>("about");
                         if (about_field)
                         {
+                                about_field->clear();
                                 if (self->mAllowEdit && (self->mAvatarID == agent_id))
                                 {
+                                        about_field->setText(fl_about_text);
                                 }
                                 else
                                 {