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

Removed the new "Set your own Imprudence tag colour feature".  Should check though, might be bits left that where not obvious.

Conflicts:
	.gitignore
	linden/indra/cmake/00-Common.cmake
	linden/indra/newview/llvoavatar.cpp
	linden/indra/newview/res/viewerRes.rc
	linden/indra/newview/skins/default/xui/en-us/panel_login.xml
	linden/indra/newview/viewer_manifest.py
	linden/indra/newview/viewerinfo.cpp

The usual branding conflicts.

1 files changed, 13 insertions, 0 deletions

diff --git a/linden/indra/newview/skins/default/xui/nl/floater_html.xml b/linden/indra/newview/skins/default/xui/nl/floater_html.xml
new file mode 100644
index 0000000..1604248
--- /dev/null
+++ b/linden/indra/newview/skins/default/xui/nl/floater_html.xml
@@ -0,0 +1,13 @@
+<?xml version="1.0" encoding="utf-8" standalone="yes"?>
+<floater name="htmlfloater" title="">
+        <button label="Sluiten" name="close_btn"/>
+        <button label="Terug" name="back_btn"/>
+        <button label="Vooruit" name="forward_btn"/>
+        <button label="Ga" name="go_btn"/>
+        <string name="home_page_url">
+                http://www.secondlife.com
+        </string>
+        <string name="support_page_url">
+                http://support.secondlife.com
+        </string>
+</floater>