Merge

indra/llui/llui.cpp

indra/llui/llview.cpp

indra/newview/app_settings/settings.xml

indra/newview/llavataractions.cpp

indra/newview/llavataractions.h

indra/newview/llfloatermediasettings.cpp

indra/newview/llfriendcard.cpp

indra/newview/llimview.cpp

indra/newview/llinventorybridge.cpp

indra/newview/llinventorymodel.cpp

indra/newview/llpanelavatar.cpp

indra/newview/llpanelmediasettingsgeneral.cpp

indra/newview/llpanelmediasettingsgeneral.h

indra/newview/llpanelmediasettingspermissions.cpp

indra/newview/llpanelmediasettingspermissions.h

indra/newview/llpanelmediasettingssecurity.cpp

indra/newview/llpanelmediasettingssecurity.h

indra/newview/llpanelpeople.cpp

indra/newview/llviewermenu.cpp

indra/newview/llvovolume.cpp