From ac0046301c98c7b434143f17bfb16eac843a09ca Mon Sep 17 00:00:00 2001
From: Vadim Savchuk <vsavchuk@productengine.com>
Date: Wed, 14 Jul 2010 19:40:09 +0300
Subject: EXT-8361 FIXED Set a name for a nameless parent panel.

Reviewed by Mike Antipov at https://codereview.productengine.com/secondlife/r/755/

--HG--
branch : product-engine
---
 indra/newview/skins/default/xui/da/panel_nearby_media.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'indra/newview/skins/default/xui/da')

diff --git a/indra/newview/skins/default/xui/da/panel_nearby_media.xml b/indra/newview/skins/default/xui/da/panel_nearby_media.xml
index 95bfc89f20..9b8b70bb34 100644
--- a/indra/newview/skins/default/xui/da/panel_nearby_media.xml
+++ b/indra/newview/skins/default/xui/da/panel_nearby_media.xml
@@ -36,7 +36,7 @@
 			<scroll_list.columns label="Navn" name="media_name"/>
 			<scroll_list.columns label="Debug" name="media_debug"/>
 		</scroll_list>
-		<panel>
+		<panel name="media_controls_panel">
 			<layout_stack name="media_controls">
 				<layout_panel name="stop">
 					<button name="stop_btn" tool_tip="Stop valgte medie"/>
-- 
cgit v1.2.3


From 6f640f86ca09e16df5db5316f3e953d8c633249a Mon Sep 17 00:00:00 2001
From: Vadim Savchuk <vsavchuk@productengine.com>
Date: Wed, 14 Jul 2010 19:43:22 +0300
Subject: EXT-8356 FIXED Enabled localization of the "Touch" item of object
 context menu.

Since label of the "Touch" object context menu item may be overridden by the object with
something like "Sit" or "Kiss", i.e. the label can be different from the default one,
there is a special code for handling this.
The code uses parameter of the on_enable callback as a label for the menu item.
So, the fix is to pass localized label to on_enable callback of the "Object Touch" menu item.

Reviewed by Mike Antipov at https://codereview.productengine.com/secondlife/r/759/

--HG--
branch : product-engine
---
 indra/newview/skins/default/xui/da/menu_object.xml | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

(limited to 'indra/newview/skins/default/xui/da')

diff --git a/indra/newview/skins/default/xui/da/menu_object.xml b/indra/newview/skins/default/xui/da/menu_object.xml
index c98a07e140..f4f7eb0af8 100644
--- a/indra/newview/skins/default/xui/da/menu_object.xml
+++ b/indra/newview/skins/default/xui/da/menu_object.xml
@@ -1,6 +1,8 @@
 <?xml version="1.0" encoding="utf-8" standalone="yes"?>
 <context_menu name="Object Pie">
-	<menu_item_call label="Berør" name="Object Touch"/>
+	<menu_item_call label="Berør" name="Object Touch">
+		<on_enable parameter="Berør" name="EnableTouch"/>
+	</menu_item_call>
 	<menu_item_call label="Redigér" name="Edit..."/>
 	<menu_item_call label="Byg" name="Build"/>
 	<menu_item_call label="Åben" name="Open"/>
-- 
cgit v1.2.3