From 366aa236f2964855bcb6f8b95f52e8bdad902651 Mon Sep 17 00:00:00 2001
From: Richard Linden <none@none>
Date: Wed, 17 Feb 2010 14:37:28 -0800
Subject: EXT-5461 - Installing 1.23.5 release version over recent 2.0 builds
 corrupts 1.23s UI

reviewed by Leyla
---
 indra/newview/skins/default/xui/pl/floater_moveview.xml | 15 ---------------
 1 file changed, 15 deletions(-)
 delete mode 100755 indra/newview/skins/default/xui/pl/floater_moveview.xml

(limited to 'indra/newview/skins/default/xui/pl/floater_moveview.xml')

diff --git a/indra/newview/skins/default/xui/pl/floater_moveview.xml b/indra/newview/skins/default/xui/pl/floater_moveview.xml
deleted file mode 100755
index e28cfd589d..0000000000
--- a/indra/newview/skins/default/xui/pl/floater_moveview.xml
+++ /dev/null
@@ -1,15 +0,0 @@
-<?xml version="1.0" encoding="utf-8" standalone="yes" ?>
-<floater name="move_floater">
-<panel name="panel_actions">
-	<button label="" label_selected="" name="turn left btn" tool_tip="Obróć w lewo" />
-	<button label="" label_selected="" name="turn right btn" tool_tip="Obroć w Prawo" />
-	<button label="" label_selected="" name="move up btn"
-	     tool_tip="Skocz lub zacznij latać w górę" />
-	<button label="" label_selected="" name="move down btn"
-	     tool_tip="Pochyl się lub zacznij latać w dół" />
-	<joystick_slide name="slide left btn" tool_tip="Przesuń w lewo" />
-	<joystick_slide name="slide right btn" tool_tip="Przesuń w prawo" />
-	<joystick_turn name="forward btn" tool_tip="Przesuń do przodu" />
-	<joystick_turn name="backward btn" tool_tip="Przesuń do tyłu" />
-</panel>
-</floater>
-- 
cgit v1.2.3


From 9dbe107f4e547d1aec0a234eaa0e6f83dd987898 Mon Sep 17 00:00:00 2001
From: Kent Quirk <q@lindenlab.com>
Date: Thu, 18 Feb 2010 20:37:37 -0500
Subject: move base back to default because doing it as a backout was causing
 merge errors

---
 indra/newview/skins/default/xui/pl/floater_moveview.xml | 15 +++++++++++++++
 1 file changed, 15 insertions(+)
 create mode 100644 indra/newview/skins/default/xui/pl/floater_moveview.xml

(limited to 'indra/newview/skins/default/xui/pl/floater_moveview.xml')

diff --git a/indra/newview/skins/default/xui/pl/floater_moveview.xml b/indra/newview/skins/default/xui/pl/floater_moveview.xml
new file mode 100644
index 0000000000..e28cfd589d
--- /dev/null
+++ b/indra/newview/skins/default/xui/pl/floater_moveview.xml
@@ -0,0 +1,15 @@
+<?xml version="1.0" encoding="utf-8" standalone="yes" ?>
+<floater name="move_floater">
+<panel name="panel_actions">
+	<button label="" label_selected="" name="turn left btn" tool_tip="Obróć w lewo" />
+	<button label="" label_selected="" name="turn right btn" tool_tip="Obroć w Prawo" />
+	<button label="" label_selected="" name="move up btn"
+	     tool_tip="Skocz lub zacznij latać w górę" />
+	<button label="" label_selected="" name="move down btn"
+	     tool_tip="Pochyl się lub zacznij latać w dół" />
+	<joystick_slide name="slide left btn" tool_tip="Przesuń w lewo" />
+	<joystick_slide name="slide right btn" tool_tip="Przesuń w prawo" />
+	<joystick_turn name="forward btn" tool_tip="Przesuń do przodu" />
+	<joystick_turn name="backward btn" tool_tip="Przesuń do tyłu" />
+</panel>
+</floater>
-- 
cgit v1.2.3