Merge remote-tracking branch 'imprudence/next' into next

Unless otherwise stated, Imprudence changes accepted.  The three images seem to be the same.
Conflicts:
	.gitignore
	linden/indra/develop.py
	linden/indra/llcommon/llsdserialize_xml.cpp
	linden/indra/newview/CMakeLists.txt
		Manually combined MOAP, OTR, and WL changes from both.
	linden/indra/newview/app_settings/default_grids.xml
		Manually merged the grid collection.
		Also updated IG info.
	linden/indra/newview/hippoupdate.cpp
	linden/indra/newview/llettherebelight.cpp
		Just used the Imprudence copy.
	linden/indra/newview/llviewermessage.cpp
		Keep unbranding.
	linden/indra/newview/llvoavatar.cpp
		Manually merge client tags.
	linden/indra/newview/res/viewerRes.rc
		Manually merge version from Impy.
	linden/indra/newview/skins/dark/colors_base.xml
		Keep unbranding.
	linden/indra/newview/skins/default/html/unabletoconnect.png
	linden/indra/newview/skins/default/textures/icon_top_pick.tga
	linden/indra/newview/skins/default/xui/en-us/floater_about.xml
		Manual merging of contributors.
	linden/indra/newview/skins/gemini/colors_base.xml
		Keep unbranding.
	linden/indra/newview/skins/gemini/textures/icon_top_pick.tga
	linden/indra/newview/viewer_manifest.py
		Manually merged boost, gstreamer, OTR, and name.
	linden/indra/newview/viewerinfo.cpp
		Manually merge the comment.

1 files changed, 0 insertions, 18 deletions

diff --git a/linden/indra/newview/skins/default/xui/zh/notifications.xml b/linden/indra/newview/skins/default/xui/zh/notifications.xml
index ea49e35..9ee9d2f 100644
--- a/linden/indra/newview/skins/default/xui/zh/notifications.xml
+++ b/linden/indra/newview/skins/default/xui/zh/notifications.xml
@@ -3624,24 +3624,6 @@ GLOW —  发光
    name="okignore"
    yestext="OK"/>
 </notification>
-  
-<notification name="WebLaunchImprudenceBlog">
-前往 Imprudence 官方日志阅读最新的新闻和信息。
-  <usetemplate
-   ignoretext="打开网络浏览器阅读网络日志时"
-   name="okcancelignore"
-   notext="取消"
-   yestext="打开网页"/>
-</notification>
-
-<notification name="WebLaunchImprudenceForums">
-前往 Imprudence 官方论坛讨论 Imprudence 工程。
-  <usetemplate
-   ignoretext="打开网络浏览器阅读论坛时"
-   name="okcancelignore"
-   notext="取消"
-   yestext="打开网页"/>
-</notification>
 
 <notification
  icon="alert.tga"