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, 15 insertions, 0 deletions

diff --git a/linden/indra/newview/skins/default/xui/nl/floater_beacons.xml b/linden/indra/newview/skins/default/xui/nl/floater_beacons.xml
new file mode 100644
index 0000000..84196ac
--- /dev/null
+++ b/linden/indra/newview/skins/default/xui/nl/floater_beacons.xml
@@ -0,0 +1,15 @@
+<?xml version="1.0" encoding="utf-8" standalone="yes"?>
+<floater name="beacons" title="Bakens">
+        <panel name="beacons_panel">
+                <check_box label="Gescripte objecten met alleen Aanraken" name="touch_only"/>
+                <check_box label="Gescripte objecten" name="scripted"/>
+                <check_box label="Fysieke objecten" name="physical"/>
+                <check_box label="Geluidsbronnen" name="sounds"/>
+                <check_box label="Particlebronnen" name="particles"/>
+                <check_box label="Markeringen weergeven" name="highlights"/>
+                <check_box label="Bakens weergeven" name="beacons"/>
+                <text name="beacon_width_label">
+                        Bakenbreedte:
+                </text>
+        </panel>
+</floater>