From 4cda1e61c4ac61244229604d6c046bc949e04d98 Mon Sep 17 00:00:00 2001
From: Damian Zhaoying <damian.zhaoying@avataresargentinos.com.ar>
Date: Sat, 27 Jul 2013 15:54:59 -0300
Subject: [PATCH 1/6] Spanish translations updates: new notifications strings

---
 .../skins/default/xui/es/notifications.xml    | 38 +++++++++++++++++++
 1 file changed, 38 insertions(+)

diff --git a/indra/newview/skins/default/xui/es/notifications.xml b/indra/newview/skins/default/xui/es/notifications.xml
index d0bab04ca..97368ed39 100644
--- a/indra/newview/skins/default/xui/es/notifications.xml
+++ b/indra/newview/skins/default/xui/es/notifications.xml
@@ -72,6 +72,44 @@
 			<button name="Cancel" text="$canceltext"/>
 		</form>
 	</template>
+
+	<notification name="AIXMLExportWriteError">
+		Fallo de Exportación: no se puede abrir el archivo &quot;[FILE]&quot; para escritura.
+	</notification>
+
+	<notification name="AIXMLImportGridMismatch">
+		Aviso de Importación: No se pueden aplicar las texturas: El [FILE] fue exportado en el grid &quot;[GRIDNAME]&quot; mientras que el grid actual es &quot;[CURGRID]&quot;.
+	</notification>
+
+	<notification name="AIXMLImportParseError">
+		Fallo de Importación: no se puede leer o analizar el archivo de vestimenta para importar &quot;[FILE]&quot;.
+	</notification>
+
+	<notification name="AIXMLImportRootTypeError">
+		Fallo de Importación: el archivo &quot;[FILE]&quot; no es un archivo linden_genepool XML.
+	</notification>
+
+	<notification name="AIXMLImportRootVersionError">
+		Fallo de Importación: el archivo &quot;[FILE]&quot; contiene datos linden_genepool XML con [TAG] erróneo. Se requiere Versión &quot;[VERSIONMAJOR].0&quot; o inferior.
+	</notification>
+
+	<notification name="AIXMLImportInvalidError">
+		Fallo de Importación: el archivo &quot;[FILE]&quot; contiene datos inválidos.
+	</notification>
+
+	<notification name="AIXMLImportDifferentGrid">
+		La importación se ha realizado con exito, pero ten presente que el objeto vestible fue exportado desde el grid [EXPORTGRID] (y el grid actual es [CURRENTGRID]). ¡No se aplicaron las UUIDs de las Texturas!
+	</notification>
+
+	<notification name="AIXMLImportMixedGrid">
+		La importación se ha realizado con exito, pero ten presente que el objeto vestible fue exportado desde el grid [EXPORTGRID] (y el grid actual es [CURRENTGRID]).¡Se aplicaron las UUIDs de la Texturas pero quizás no existan aquí!
+	</notification>
+
+	<notification name="AIXMLImportWearableTypeMismatch">
+		Aviso de Importación: el archivo &quot;[FILE]&quot; no contiene un objeto vestible de tipo [TYPE].
+Éste contiene un arquetipo de tipo [ARCHETYPENAME]. Por favor, selecciona el tipo correcto antes de comenzar la importación.
+	</notification>
+
 	
 	<notification name="MediaAlert">
 		El propietario de esta parcela ha solicitado que el siguiente URL de [TYPE] sea cargado en tu visor:

From 2b2a6d5ea6ae3843d9342c886973fa71cdab13c2 Mon Sep 17 00:00:00 2001
From: Inusaito Sayori <Inusaito@gmail.com>
Date: Sat, 27 Jul 2013 16:40:26 -0400
Subject: [PATCH 2/6] Touchups to scroll list building

Moved handling of mouse_wheel_opaque and menu_file to setScrollListParameters
Removed setToolTip block from LLScrollListCtrl::fromXML since setToolTip lives inside of LLView::initFromXML which is called by LLUICtrl::initFromXML which was already called at this point
Added support for building columns from xml with relative_width which is synonymous with relwidth
Fixed namelist columns not supporting dynamic_width in xml (dynamicwidth is only acceptable in older xmls)
---
 indra/llui/llscrolllistctrl.cpp  | 34 +++++++++++++++-----------------
 indra/newview/llnamelistctrl.cpp | 16 +++++++++++++--
 2 files changed, 30 insertions(+), 20 deletions(-)

diff --git a/indra/llui/llscrolllistctrl.cpp b/indra/llui/llscrolllistctrl.cpp
index 20c53ca42..e0c0cb1e0 100644
--- a/indra/llui/llscrolllistctrl.cpp
+++ b/indra/llui/llscrolllistctrl.cpp
@@ -2545,6 +2545,19 @@ void LLScrollListCtrl::setScrollListParameters(LLXMLNodePtr node)
 		node->getAttributeS32("column_padding", column_padding);
 		setColumnPadding(column_padding);
 	}
+
+	if (node->hasAttribute("mouse_wheel_opaque"))
+	{
+		node->getAttribute_bool("mouse_wheel_opaque", mMouseWheelOpaque);
+	}
+
+	if (node->hasAttribute("menu_file"))
+	{
+		std::string menu_file;
+		node->getAttributeString("menu_file", menu_file);
+		mPopupMenu = LLUICtrlFactory::getInstance()->buildMenu(menu_file, LLMenuGL::sMenuContainer);
+		LLMenuGL::sMenuContainer->addChild(mPopupMenu);
+	}
 }
 
 // static
@@ -2579,22 +2592,6 @@ LLView* LLScrollListCtrl::fromXML(LLXMLNodePtr node, LLView *parent, LLUICtrlFac
 	scroll_list->initFromXML(node, parent);
 	scroll_list->setSearchColumn(search_column);
 
-	BOOL mouse_wheel_opaque = true;
-	node->getAttributeBOOL("mouse_wheel_opaque", mouse_wheel_opaque);
-	scroll_list->mMouseWheelOpaque = mouse_wheel_opaque;
-
-	std::string tool_tip;
-	node->getAttributeString("tool_tip", tool_tip);
-	scroll_list->setToolTip(tool_tip);
-
-	std::string menu_file;
-	if (node->getAttributeString("menu_file", menu_file))
-	{
-		LLMenuGL* menu = LLUICtrlFactory::getInstance()->buildMenu(menu_file, LLMenuGL::sMenuContainer);
-		LLMenuGL::sMenuContainer->addChild(menu);
-		scroll_list->setContextMenu(menu);
-	}
-
 	LLSD columns;
 	S32 index = 0;
 	for (LLXMLNodePtr child = node->getFirstChild(); child.notNull(); child = child->getNextSibling())
@@ -2634,8 +2631,9 @@ LLView* LLScrollListCtrl::fromXML(LLXMLNodePtr node, LLView *parent, LLUICtrlFac
 				columns[index]["width"] = columnwidth;
 
 			F32 columnrelwidth = 0.f;
-			if (child->getAttributeF32("relwidth", columnrelwidth))
-				columns[index]["relwidth"] = columnrelwidth;
+			if (child->getAttributeF32("relative_width", columnrelwidth)
+			|| child->getAttributeF32("relwidth", columnrelwidth))
+				columns[index]["relative_width"] = columnrelwidth;
 
 			BOOL columndynamicwidth = false;
 			if (child->getAttributeBOOL("dynamic_width", columndynamicwidth)
diff --git a/indra/newview/llnamelistctrl.cpp b/indra/newview/llnamelistctrl.cpp
index 2cce1f2de..ab2283644 100644
--- a/indra/newview/llnamelistctrl.cpp
+++ b/indra/newview/llnamelistctrl.cpp
@@ -360,11 +360,23 @@ LLView* LLNameListCtrl::fromXML(LLXMLNodePtr node, LLView *parent, LLUICtrlFacto
 			std::string sortname(columnname);
 			child->getAttributeString("sort", sortname);
 		
-			if (child->hasAttribute("relwidth"))
+			if (child->hasAttribute("relative_width"))
+			{
+				F32 columnrelwidth = 0.f;
+				child->getAttributeF32("relative_width", columnrelwidth);
+				columns[index]["relative_width"] = columnrelwidth;
+			}
+			else if (child->hasAttribute("relwidth"))
 			{
 				F32 columnrelwidth = 0.f;
 				child->getAttributeF32("relwidth", columnrelwidth);
-				columns[index]["relwidth"] = columnrelwidth;
+				columns[index]["relative_width"] = columnrelwidth;
+			}
+			else if (child->hasAttribute("dynamic_width"))
+			{
+				BOOL columndynamicwidth = FALSE;
+				child->getAttributeBOOL("dynamic_width", columndynamicwidth);
+				columns[index]["dynamic_width"] = columndynamicwidth;
 			}
 			else if (child->hasAttribute("dynamicwidth"))
 			{

From 258c0da8d3fe1f8b92cf44ccc1743634fce8a572 Mon Sep 17 00:00:00 2001
From: Inusaito Sayori <Inusaito@gmail.com>
Date: Mon, 29 Jul 2013 12:42:48 -0400
Subject: [PATCH 3/6] Apply fix for windows compile warning from internal

---
 indra/newview/llpanelgeneral.cpp | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

diff --git a/indra/newview/llpanelgeneral.cpp b/indra/newview/llpanelgeneral.cpp
index bd6f1be43..812cbc80f 100644
--- a/indra/newview/llpanelgeneral.cpp
+++ b/indra/newview/llpanelgeneral.cpp
@@ -142,13 +142,13 @@ void LLPanelGeneral::apply()
 	LLComboBox* fade_out_combobox = getChild<LLComboBox>("fade_out_combobox");
 	gSavedSettings.setS32("RenderName", fade_out_combobox->getCurrentIndex());
 	
-	LLComboBox* namesystem_combobox = getChild<LLComboBox>("namesystem_combobox");
-	LLUICtrl* show_resident_checkbox = getChild<LLUICtrl>("show_resident_checkbox");
-	if(gSavedSettings.getS32("PhoenixNameSystem")!=namesystem_combobox->getCurrentIndex() || gSavedSettings.getBOOL("LiruShowLastNameResident")!=show_resident_checkbox->getValue().asBoolean()){
-		gSavedSettings.setS32("PhoenixNameSystem", namesystem_combobox->getCurrentIndex());
-		gSavedSettings.setBOOL("LiruShowLastNameResident", show_resident_checkbox->getValue());
+	S32 namesystem_combobox_index = getChild<LLComboBox>("namesystem_combobox")->getCurrentIndex();
+	BOOL show_resident = getChild<LLUICtrl>("show_resident_checkbox")->getValue();
+	if(gSavedSettings.getS32("PhoenixNameSystem")!=namesystem_combobox_index || gSavedSettings.getBOOL("LiruShowLastNameResident")!=show_resident){
+		gSavedSettings.setS32("PhoenixNameSystem", namesystem_combobox_index);
+		gSavedSettings.setBOOL("LiruShowLastNameResident", show_resident);
 		if(gAgent.getRegion()){
-			if(namesystem_combobox->getCurrentIndex()<=0 || namesystem_combobox->getCurrentIndex()>2) LLAvatarNameCache::setUseDisplayNames(false);
+			if(namesystem_combobox_index<=0 || namesystem_combobox_index>2) LLAvatarNameCache::setUseDisplayNames(false);
 			else LLAvatarNameCache::setUseDisplayNames(true);
 			LLVOAvatar::invalidateNameTags(); // Remove all clienttags to get them updated
 

From 8680e4599cef56ffa4a58dfea50aa8246cb65b47 Mon Sep 17 00:00:00 2001
From: Inusaito Sayori <Inusaito@gmail.com>
Date: Mon, 29 Jul 2013 13:27:07 -0400
Subject: [PATCH 4/6] Satisfy Issue 904: Add option to close appearance floater
 with Esc

Setting AppearanceCloseOnEscape to true will turn this on.
---
 indra/newview/app_settings/settings.xml | 11 +++++++++++
 indra/newview/llmorphview.cpp           |  2 ++
 2 files changed, 13 insertions(+)

diff --git a/indra/newview/app_settings/settings.xml b/indra/newview/app_settings/settings.xml
index 3ec2295b5..b283f2973 100644
--- a/indra/newview/app_settings/settings.xml
+++ b/indra/newview/app_settings/settings.xml
@@ -2127,6 +2127,17 @@ This should be as low as possible, but too low may break functionality</string>
       <key>Value</key>
       <integer>1</integer>
     </map>
+    <key>AppearanceCloseOnEscape</key>
+    <map>
+      <key>Comment</key>
+      <string>When in appearance editing mode, hitting escape will work the same as the close button</string>
+      <key>Persist</key>
+      <integer>1</integer>
+      <key>Type</key>
+      <string>Boolean</string>
+      <key>Value</key>
+      <integer>0</integer>
+    </map>
     <key>AppearanceSpecialLighting</key>
     <map>
       <key>Comment</key>
diff --git a/indra/newview/llmorphview.cpp b/indra/newview/llmorphview.cpp
index bfef31156..aa441c001 100644
--- a/indra/newview/llmorphview.cpp
+++ b/indra/newview/llmorphview.cpp
@@ -132,6 +132,8 @@ void LLMorphView::setVisible(BOOL visible)
 		}
 		else
 		{
+			if (LLFloaterCustomize::instanceExists() && gSavedSettings.getBOOL("AppearanceCloseOnEscape"))
+				LLFloaterCustomize::instance().onClose(false);
 			shutdown();
 		}
 	}

From f6fb0ca8a03954c7bcbbe20ff409bec7fa5aba9c Mon Sep 17 00:00:00 2001
From: Inusaito Sayori <Inusaito@gmail.com>
Date: Mon, 29 Jul 2013 13:41:26 -0400
Subject: [PATCH 5/6] Enable Parcel Ban and Access lists regardless of parcel
 rights.

---
 indra/newview/llfloaterland.cpp | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/indra/newview/llfloaterland.cpp b/indra/newview/llfloaterland.cpp
index 1911387df..7c5801680 100644
--- a/indra/newview/llfloaterland.cpp
+++ b/indra/newview/llfloaterland.cpp
@@ -2677,13 +2677,13 @@ void LLPanelLandAccess::refresh_ui()
 				getChildView("HoursSpin")->setEnabled(can_manage_allowed);
 			}
 		}
-		getChildView("AccessList")->setEnabled(can_manage_allowed);
+		getChildView("AccessList")->setEnabled(true/*can_manage_allowed*/);
 		S32 allowed_list_count = parcel->mAccessList.size();
 		getChildView("add_allowed")->setEnabled(can_manage_allowed && allowed_list_count < PARCEL_MAX_ACCESS_LIST);
 		BOOL has_selected = (mListAccess && mListAccess->getSelectionInterface()->getFirstSelectedIndex() >= 0);
 		getChildView("remove_allowed")->setEnabled(can_manage_allowed && has_selected);
 		
-		getChildView("BannedList")->setEnabled(can_manage_banned);
+		getChildView("BannedList")->setEnabled(true/*can_manage_banned*/);
 		S32 banned_list_count = parcel->mBanList.size();
 		getChildView("add_banned")->setEnabled(can_manage_banned && banned_list_count < PARCEL_MAX_ACCESS_LIST);
 		has_selected = (mListBanned && mListBanned->getSelectionInterface()->getFirstSelectedIndex() >= 0);

From 87be371042cc5daae4b6be224e7972e502a3b334 Mon Sep 17 00:00:00 2001
From: Inusaito Sayori <Inusaito@gmail.com>
Date: Mon, 29 Jul 2013 20:09:38 -0400
Subject: [PATCH 6/6] Feature Request: Add shortcut, Ctrl-Alt-Shift-C, for
 Avatar Rendering Cost

---
 indra/newview/llviewermenu.cpp | 5 ++---
 1 file changed, 2 insertions(+), 3 deletions(-)

diff --git a/indra/newview/llviewermenu.cpp b/indra/newview/llviewermenu.cpp
index 9c6c05ec1..12562379f 100644
--- a/indra/newview/llviewermenu.cpp
+++ b/indra/newview/llviewermenu.cpp
@@ -1368,7 +1368,7 @@ void init_debug_rendering_menu(LLMenuGL* menu)
 													(void*)LLPipeline::RENDER_DEBUG_TEXTURE_PRIORITY));
 	sub_menu->addChild(new LLMenuItemCheckGL("Avatar Rendering Cost",	&LLPipeline::toggleRenderDebug, NULL,
 													&LLPipeline::toggleRenderDebugControl,
-													(void*)LLPipeline::RENDER_DEBUG_SHAME));
+													(void*)LLPipeline::RENDER_DEBUG_SHAME, 'C', MASK_CONTROL|MASK_ALT|MASK_SHIFT));
 	sub_menu->addChild(new LLMenuItemCheckGL("Texture Area (sqrt(A))",&LLPipeline::toggleRenderDebug, NULL,
 													&LLPipeline::toggleRenderDebugControl,
 													(void*)LLPipeline::RENDER_DEBUG_TEXTURE_AREA));
@@ -1669,8 +1669,7 @@ void init_server_menu(LLMenuGL* menu)
 										 &is_god_customer_service, NULL));
 		sub->addChild(new LLMenuItemCallGL("Set to Linden Content",
 										 &handle_force_parcel_to_content,
-										 &is_god_customer_service, NULL,
-										 'C', MASK_SHIFT | MASK_ALT | MASK_CONTROL));
+										 &is_god_customer_service, NULL));
 		sub->addSeparator();
 		sub->addChild(new LLMenuItemCallGL("Claim Public Land",
 										 &handle_claim_public_land, &is_god_customer_service));