From 7b8490ae1a9232246d6ccfc3fd99842bd64ecac2 Mon Sep 17 00:00:00 2001
From: Northspring <pantera.polnocy@phoenixviewer.com>
Date: Wed, 11 Jun 2014 03:18:03 +0200
Subject: [PATCH 1/3] Updated Polish translation after merge

---
 .../default/xui/pl/floater_fast_timers.xml    | 11 ++++
 .../xui/pl/floater_scene_load_stats.xml       | 64 +++++++++++++++++++
 .../skins/default/xui/pl/floater_stats.xml    | 44 +++++++++----
 .../skins/default/xui/pl/menu_viewer.xml      |  5 +-
 .../default/xui/pl/sidepanel_inventory.xml    |  2 +-
 .../newview/skins/default/xui/pl/strings.xml  |  3 +
 6 files changed, 115 insertions(+), 14 deletions(-)
 create mode 100644 indra/newview/skins/default/xui/pl/floater_scene_load_stats.xml

diff --git a/indra/newview/skins/default/xui/pl/floater_fast_timers.xml b/indra/newview/skins/default/xui/pl/floater_fast_timers.xml
index 2d04653bbd..ac3e9799ce 100644
--- a/indra/newview/skins/default/xui/pl/floater_fast_timers.xml
+++ b/indra/newview/skins/default/xui/pl/floater_fast_timers.xml
@@ -2,5 +2,16 @@
 <floater name="fast_timers">
   <string name="pause">Pauza</string>
   <string name="run">Start</string>
+  <combo_box name="time_scale_combo">
+    <item label="2x średnia"/>
+    <item label="Maksimum"/>
+    <item label="Ostatnie maksimum"/>
+    <item label="100ms"/>
+  </combo_box>
+  <combo_box name="metric_combo">
+    <item label="Czas"/>
+    <item label="Ilość odwołań"/>
+    <item label="Hz"/>
+  </combo_box>
   <button name="pause_btn" label="Pauza" />
 </floater>
diff --git a/indra/newview/skins/default/xui/pl/floater_scene_load_stats.xml b/indra/newview/skins/default/xui/pl/floater_scene_load_stats.xml
new file mode 100644
index 0000000000..571d3f4aa5
--- /dev/null
+++ b/indra/newview/skins/default/xui/pl/floater_scene_load_stats.xml
@@ -0,0 +1,64 @@
+<?xml version="1.0" encoding="utf-8" standalone="yes" ?>
+<floater name="Scene Load Statistics" title="STATYSTYKI OBCIĄŻENIA SCENY">
+	<button label="Pauza" name="playpause"/>
+    <scroll_container name="statistics_scroll">
+		<container_view name="statistics_view">
+			<stat_view name="basic" label="Podstawowe">
+				<stat_bar name="frame difference" label="Różnica pomiędzy klatkami"/>
+				<stat_bar label="Przepustowość" name="bandwidth"/>
+				<stat_bar label="Utracone pakiety" name="packet_loss"/>
+			</stat_view>
+			<stat_view name="advanced" label="Zaawansowane">
+				<stat_view name="render" label="Rendering">
+					<stat_bar name="objs" label="Wszystkie obiekty"/>
+					<stat_bar name="newobjs" label="Nowe obiekty" unit_label="/sek"/>
+					<stat_bar name="object_cache_hits" label="Wspł. trafień obiektów do cache"/>
+				</stat_view>
+				<stat_view name="texture" label="Tekstura">
+					<stat_bar name="texture_cache_hits" label="Wspł. trafień do cache"/>
+					<stat_bar name="texture_cache_read_latency" label="Opóźnienie odczytu cache"/>
+					<stat_bar name="numimagesstat" label="Suma"/>
+					<stat_bar name="numrawimagesstat" label="Suma surowych"/>
+				</stat_view>
+				<stat_view name="network" label="Sieć">
+					<stat_bar name="packetsinstat" label="Pakiety wchodzące" unit_label="/sek"/>
+					<stat_bar name="packetsoutstat" label="Pakiety wychodzące" unit_label="/sek"/>
+					<stat_bar name="objectdatareceived" label="Obiekty"/>
+					<stat_bar name="texturedatareceived" label="Tekstury"/>
+					<stat_bar name="assetudpdatareceived" label="Dane (assety)"/>
+					<stat_bar name="layersdatareceived" label="Warstwy"/>
+					<stat_bar name="messagedatain" label="Aktualna il. wchodząca"/>
+					<stat_bar name="messagedataout" label="Aktualna il. wychodząca"/>
+					<stat_bar name="vfspendingoperations" label="Operacje oczekujące VFS" unit_label=" op."/>
+				</stat_view>
+			</stat_view>
+			<stat_view name="sim" label="Symulator">
+				<stat_bar name="simobjects" label="Obiekty"/>
+				<stat_bar name="simactiveobjects" label="Aktywne obiekty"/>
+				<stat_bar name="simactivescripts" label="Aktywne skrypty"/>
+				<stat_bar name="siminpps" label="Pakiety wchodzące" unit_label="pkt/sek"/>
+				<stat_bar name="simoutpps" label="Pakiety wychodzące" unit_label="pkt/sek"/>
+				<stat_bar name="simpendingdownloads" label="Oczekujące pobrania"/>
+				<stat_bar name="simpendinguploads" label="Oczekujące załadowania"/>
+				<stat_bar name="simtotalunackedbytes" label="Wszystkie niepotwierdzone bajty"/>
+				<stat_view label="Czas (ms)" name="simperf">
+					<stat_bar label="Całkowity czas klatek" name="simframemsec"/>
+					<stat_bar label="Czas sieci" name="simnetmsec"/>
+					<stat_bar label="Czas fizyki" name="simsimphysicsmsec"/>
+					<stat_bar label="Czas symulatora" name="simsimothermsec"/>
+					<stat_bar label="Czas agenta" name="simagentmsec"/>
+					<stat_bar label="Czas obrazu" name="simimagesmsec"/>
+					<stat_bar label="Czas skryptu" name="simscriptmsec"/>
+					<stat_bar name="simsparemsec" label="Czas wolny"/>
+					<stat_view name="timedetails" label="Szczegóły czasu">
+						<stat_bar name="simsimphysicsstepmsec" label="  Skok fizyki"/>
+						<stat_bar name="simsimphysicsshapeupdatemsec" label="  Akt. kształtów fizyki"/>
+						<stat_bar name="simsimphysicsothermsec" label="  Inna fizyka"/>
+						<stat_bar name="simsleepmsec" label="  Czas pauzy"/>
+						<stat_bar name="simpumpiomsec" label="  Skok IO"/>
+					</stat_view>
+				</stat_view>
+			</stat_view>
+		</container_view>
+	</scroll_container>
+</floater>
diff --git a/indra/newview/skins/default/xui/pl/floater_stats.xml b/indra/newview/skins/default/xui/pl/floater_stats.xml
index e7fed50d0e..fd1688a713 100755
--- a/indra/newview/skins/default/xui/pl/floater_stats.xml
+++ b/indra/newview/skins/default/xui/pl/floater_stats.xml
@@ -10,11 +10,15 @@
 			</stat_view>
 			<stat_view label="Zaawansowane" name="advanced">
 				<stat_view label="Rendering" name="render">
-					<stat_bar label="KTris rysowane na kl." name="ktrisframe"/>
-					<stat_bar label="KTris rysowane na sek." name="ktrissec"/>
+					<stat_bar label="KTris na klatkę" name="ktrisframe"/>
+					<stat_bar label="KTris na sekundę" name="ktrissec"/>
 					<stat_bar label="Wszystkie obiekty" name="objs"/>
+					<stat_bar label="Obiekty w cache" name="objs"/>
 					<stat_bar label="Nowe obiekty" name="newobjs"/>
 					<stat_bar name="object_cache_hits" label="Wspł. trafień obiektów do cache"/>
+					<stat_bar name="occlusion_queries" label="Ilość wywołań okluzji"/>
+					<stat_bar name="occluded" label="Obiekty z okluzją"/>
+					<stat_bar name="unoccluded" label="Obiekty bez okluzji"/>
 				</stat_view>
 				<stat_view label="Tekstura" name="texture">
 					<stat_bar name="texture_cache_hits" label="Wspł. trafień do cache"/>
@@ -26,15 +30,32 @@
 					<stat_bar label="Pamięć surowa" name="rawmemstat"/>
 					<stat_bar label="Pamięć przypisana" name="glboundmemstat"/>
 				</stat_view>
+				<stat_view name="memory" label="Użycie pamięci">
+					<stat_bar name="LLTrace" label="LLTrace"/>
+					<stat_bar name="LLView" label="Interfejs"/>
+					<stat_bar name="LLFontFreetype" label="Czcionki"/>
+					<stat_bar name="LLInventoryObject" label="Szafa"/>
+					<stat_bar name="LLViewerObject" label="Obiekty przeglądarki"/>
+					<stat_bar name="LLViewerOctreeGroup" label="Dane grupy drzewa ósemkowego"/>
+					<stat_bar name="LLViewerOctreeEntry" label="Dane drzewa ósemkowego"/>
+					<stat_bar name="LLVOCacheEntry" label="Pamięć podr. obiektów przegl."/>
+					<stat_bar name="LLDrawable" label="Obiekty rysowane"/>
+					<stat_bar name="LLFace" label="Dane powierzchni"/>
+					<stat_bar name="LLDrawInfo" label="Informacje rysowania"/>
+					<stat_bar name="LLTexture" label="Dane tekstur"/>
+					<stat_bar name="LLImage" label="Dane obrazów"/>
+					<stat_bar name="LLImageGL" label="Dane obrazu GL"/>
+					<stat_bar name="LLVertexBuffer" label="Bufory wierzchołków"/>
+				</stat_view>
 				<stat_view label="Sieć" name="network">
 					<stat_bar label="Pakiety wchodzące" name="packetsinstat"/>
 					<stat_bar label="Pakiety wychodzące" name="packetsoutstat"/>
-					<stat_bar label="Obiekty" name="objectkbitstat"/>
-					<stat_bar label="Tekstury" name="texturekbitstat"/>
-					<stat_bar label="Dane (assety)" name="assetkbitstat"/>
-					<stat_bar label="Warstwy" name="layerskbitstat"/>
-					<stat_bar label="Aktualna il. wchodząca" name="actualinkbitstat"/>
-					<stat_bar label="Aktualna il. wychodząca" name="actualoutkbitstat"/>
+					<stat_bar label="Obiekty" name="objectdatareceived"/>
+					<stat_bar label="Tekstury" name="texturedatareceived"/>
+					<stat_bar label="Dane (assety)" name="assetudpdatareceived"/>
+					<stat_bar label="Warstwy" name="layersdatareceived"/>
+					<stat_bar label="Aktualna il. wchodząca" name="messagedatain"/>
+					<stat_bar label="Aktualna il. wychodząca" name="messagedataout"/>
 					<stat_bar label="Operacje oczekujące VFS" name="vfspendingoperations"/>
 				</stat_view>
 			</stat_view>
@@ -58,10 +79,9 @@
 				<stat_view name="simpathfinding" label="Odnajdywanie ścieżek">
 					<stat_bar label="  Czasokrok dla AI" name="simsimaistepmsec"/>
 					<stat_bar label="  Pominięte kroki sylwetek" name="simsimskippedsilhouettesteps" unit_label="/sek"/>
-					<stat_bar label="  Postaci zaktualizowanych" name="simsimpctsteppedcharacters"/>
 				</stat_view>
-				<stat_bar label="Pakiety wchodzące" name="siminpps"/>
-				<stat_bar label="Pakiety wychodzące" name="simoutpps"/>
+				<stat_bar label="Pakiety wchodzące" unit_label="pkt/sek" name="siminpps"/>
+				<stat_bar label="Pakiety wychodzące" unit_label="pkt/sek" name="simoutpps"/>
 				<stat_bar label="Oczekujące pobrania" name="simpendingdownloads"/>
 				<stat_bar label="Oczekujące załadowania" name="simpendinguploads"/>
 				<stat_bar label="Wszystkie niepotwierdzone bajty" name="simtotalunackedbytes"/>
@@ -74,7 +94,7 @@
 					<stat_bar label="Czas obrazu" name="simimagesmsec"/>
 					<stat_bar label="Czas skryptu" name="simscriptmsec"/>
 					<stat_bar name="simsparemsec" label="Czas wolny"/>
-					<stat_view name="timedetails" label="Szczegóły czasu (ms)">
+					<stat_view name="timedetails" label="Szczegóły czasu">
 						<stat_bar name="simsimphysicsstepmsec" label="  Skok fizyki"/>
 						<stat_bar name="simsimphysicsshapeupdatemsec" label="  Akt. kształtów fizyki"/>
 						<stat_bar name="simsimphysicsothermsec" label="  Inna fizyka"/>
diff --git a/indra/newview/skins/default/xui/pl/menu_viewer.xml b/indra/newview/skins/default/xui/pl/menu_viewer.xml
index cb29e910f2..a1718e4dbe 100755
--- a/indra/newview/skins/default/xui/pl/menu_viewer.xml
+++ b/indra/newview/skins/default/xui/pl/menu_viewer.xml
@@ -278,7 +278,8 @@
 		<menu_item_check label="Wykonuj zdjęcia bez efektu dźwiękowego i animacji" name="QuietSnapshotsToDisk"/>
 		<menu label="Narzędzia wydajności" name="Performance Tools">
 			<menu_item_call label="Pomiar lagów" name="Lag Meter"/>
-			<menu_item_check label="Statystyki" name="Statistics Bar"/>
+			<menu_item_check label="Statystyki ogólne" name="Statistics Bar"/>
+			<menu_item_call label="Statystyki obciążenia sceny" name="Scene Load Statistics"/>
 			<menu_item_check label="Pokaż wartość renderowania awatara" name="Avatar Rendering Cost"/>
 		</menu>
 		<menu label="Podświetlanie i widoczność" name="Highlighting and Visibility">
@@ -357,6 +358,7 @@
 			<menu_item_check label="Podgląd procesów" name="Fast Timers"/>
 			<menu_item_check label="Pamięć" name="Memory"/>
 			<menu_item_check label="Statystyki sceny" name="Scene Statistics"/>
+			<menu_item_check label="Monitor obciążenia sceny" name="Scene Loading Monitor"/>
 			<menu_item_call label="Konsola debugowania dla ładowania tekstur" name="Texture Fetch Debug Console"/>
 			<menu_item_call label="Konsola debugowania regionu" name="Region Debug Console"/>
 			<menu_item_call label="Info o regionie do konsoli debugowania" name="Region Info to Debug Console"/>
@@ -450,6 +452,7 @@
 			<menu_item_check label="Renderowania przyłączonego światła" name="Render Attached Lights"/>
 			<menu_item_check label="Renderowanie przyłączonych cząsteczek" name="Render Attached Particles"/>
 			<menu_item_check label="Wyświetlaj obiekty odblaskowe" name="Hover Glow Objects"/>
+			<menu_item_call label="Wyczyść natychmiast pamięć podręczną" name="Cache Clear"/>
 		</menu>
 		<menu label="Sieć" name="Network">
 			<menu_item_check label="Zatrzymaj awatara" name="AgentPause"/>
diff --git a/indra/newview/skins/default/xui/pl/sidepanel_inventory.xml b/indra/newview/skins/default/xui/pl/sidepanel_inventory.xml
index 25297a90f0..92e7998ee6 100755
--- a/indra/newview/skins/default/xui/pl/sidepanel_inventory.xml
+++ b/indra/newview/skins/default/xui/pl/sidepanel_inventory.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8" standalone="yes"?>
 <panel label="Rzeczy" name="objects panel">
-	<panel label="" name="sidepanel_inventory_panel">
+	<panel name="sidepanel_inventory_panel">
 		<layout_stack name="inventory_layout_stack">
 			<layout_panel name="inbox_layout_panel">
 				<panel name="marketplace_inbox">
diff --git a/indra/newview/skins/default/xui/pl/strings.xml b/indra/newview/skins/default/xui/pl/strings.xml
index d9d685cc6d..4cd878a1cf 100755
--- a/indra/newview/skins/default/xui/pl/strings.xml
+++ b/indra/newview/skins/default/xui/pl/strings.xml
@@ -1838,6 +1838,9 @@ Spróbuj zalogować się ponownie za minutę.
 	<string name="CompileQueueDownloadedCompiling">
 		Pobieranie zakończone, trwa kompilowanie
 	</string>
+	<string name="CompileQueueServiceUnavailable">
+		Usługa kompilacji skryptów nie jest w tej chwili dostępna
+	</string>
 	<string name="CompileQueueScriptNotFound">
 		Skrypt nie został odnaleziony na serwerze.
 	</string>

From 344f62afd423260774c439cbb88d4bdc77690e1a Mon Sep 17 00:00:00 2001
From: Northspring <pantera.polnocy@phoenixviewer.com>
Date: Wed, 11 Jun 2014 03:27:31 +0200
Subject: [PATCH 2/3] Localizability fixes in skin files

---
 .../skins/ansastorm/xui/en/sidepanel_inventory.xml |  2 +-
 .../skins/default/xui/en/floater_fast_timers.xml   | 14 +++++++-------
 .../newview/skins/default/xui/en/floater_stats.xml |  2 +-
 .../skins/default/xui/pl/floater_fast_timers.xml   | 14 +++++++-------
 .../default/xui/pl/floater_scene_load_stats.xml    |  2 +-
 .../newview/skins/default/xui/pl/floater_stats.xml |  2 +-
 .../starlightcui/xui/en/sidepanel_inventory.xml    |  2 +-
 .../skins/vintage/xui/en/sidepanel_inventory.xml   |  2 +-
 .../skins/vintage/xui/es/sidepanel_inventory.xml   |  2 +-
 .../skins/vintage/xui/pl/sidepanel_inventory.xml   |  2 +-
 10 files changed, 22 insertions(+), 22 deletions(-)

diff --git a/indra/newview/skins/ansastorm/xui/en/sidepanel_inventory.xml b/indra/newview/skins/ansastorm/xui/en/sidepanel_inventory.xml
index 193cf3ec84..f0c6f6024d 100644
--- a/indra/newview/skins/ansastorm/xui/en/sidepanel_inventory.xml
+++ b/indra/newview/skins/ansastorm/xui/en/sidepanel_inventory.xml
@@ -12,7 +12,7 @@
 		 follows="all"
 		 layout="topleft"
 		 left="0"
-		 name="sidepanel__inventory_panel"
+		 name="sidepanel_inventory_panel"
 		 top="0"
 		 label=""
 		 height="565"
diff --git a/indra/newview/skins/default/xui/en/floater_fast_timers.xml b/indra/newview/skins/default/xui/en/floater_fast_timers.xml
index 671f116df3..fa7147d9ca 100755
--- a/indra/newview/skins/default/xui/en/floater_fast_timers.xml
+++ b/indra/newview/skins/default/xui/en/floater_fast_timers.xml
@@ -22,10 +22,10 @@
              top="5"
              width="150"
              height="20">
-    <item label="2x Average"/>
-    <item label="Max"/>
-    <item label="Recent Max"/>
-    <item label="100ms"/>
+    <item name="2x Average" label="2x Average"/>
+    <item name="Max" label="Max"/>
+    <item name="Recent Max" label="Recent Max"/>
+    <item name="100ms" label="100ms"/>
   </combo_box>
   <combo_box name="metric_combo"
              follows="left|top"
@@ -33,9 +33,9 @@
              top="5"
              width="150"
              height="20">
-    <item label="Time"/>
-    <item label="Number of Calls"/>
-    <item label="Hz"/>
+    <item name="Time" label="Time"/>
+    <item name="Number of Calls" label="Number of Calls"/>
+    <item name="Hz" label="Hz"/>
   </combo_box>
   <button follows="top|right" 
           name="pause_btn"
diff --git a/indra/newview/skins/default/xui/en/floater_stats.xml b/indra/newview/skins/default/xui/en/floater_stats.xml
index c4433a3d1f..02340a15da 100755
--- a/indra/newview/skins/default/xui/en/floater_stats.xml
+++ b/indra/newview/skins/default/xui/en/floater_stats.xml
@@ -62,7 +62,7 @@
           <stat_bar name="objs"
                     label="Total Objects"
                     stat="numobjectsstat"/>
-					<stat_bar name="objs"
+					<stat_bar name="cachedobjs"
                     label="Cached Objects"
                     stat="numactivecachedobjects"/>
 					<stat_bar name="newobjs"
diff --git a/indra/newview/skins/default/xui/pl/floater_fast_timers.xml b/indra/newview/skins/default/xui/pl/floater_fast_timers.xml
index ac3e9799ce..f41fe33e48 100644
--- a/indra/newview/skins/default/xui/pl/floater_fast_timers.xml
+++ b/indra/newview/skins/default/xui/pl/floater_fast_timers.xml
@@ -3,15 +3,15 @@
   <string name="pause">Pauza</string>
   <string name="run">Start</string>
   <combo_box name="time_scale_combo">
-    <item label="2x średnia"/>
-    <item label="Maksimum"/>
-    <item label="Ostatnie maksimum"/>
-    <item label="100ms"/>
+    <item name="2x Average" label="2x średnia"/>
+    <item name="Max" label="Maksimum"/>
+    <item name="Recent Max" label="Ostatnie maksimum"/>
+    <item name="100ms" label="100ms"/>
   </combo_box>
   <combo_box name="metric_combo">
-    <item label="Czas"/>
-    <item label="Ilość odwołań"/>
-    <item label="Hz"/>
+    <item name="Time" label="Czas"/>
+    <item name="Number of Calls" label="Ilość odwołań"/>
+    <item name="Hz" label="Hz"/>
   </combo_box>
   <button name="pause_btn" label="Pauza" />
 </floater>
diff --git a/indra/newview/skins/default/xui/pl/floater_scene_load_stats.xml b/indra/newview/skins/default/xui/pl/floater_scene_load_stats.xml
index 571d3f4aa5..c1db85c92f 100644
--- a/indra/newview/skins/default/xui/pl/floater_scene_load_stats.xml
+++ b/indra/newview/skins/default/xui/pl/floater_scene_load_stats.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="utf-8" standalone="yes" ?>
 <floater name="Scene Load Statistics" title="STATYSTYKI OBCIĄŻENIA SCENY">
 	<button label="Pauza" name="playpause"/>
-    <scroll_container name="statistics_scroll">
+	<scroll_container name="statistics_scroll">
 		<container_view name="statistics_view">
 			<stat_view name="basic" label="Podstawowe">
 				<stat_bar name="frame difference" label="Różnica pomiędzy klatkami"/>
diff --git a/indra/newview/skins/default/xui/pl/floater_stats.xml b/indra/newview/skins/default/xui/pl/floater_stats.xml
index fd1688a713..9577b516a3 100755
--- a/indra/newview/skins/default/xui/pl/floater_stats.xml
+++ b/indra/newview/skins/default/xui/pl/floater_stats.xml
@@ -13,7 +13,7 @@
 					<stat_bar label="KTris na klatkę" name="ktrisframe"/>
 					<stat_bar label="KTris na sekundę" name="ktrissec"/>
 					<stat_bar label="Wszystkie obiekty" name="objs"/>
-					<stat_bar label="Obiekty w cache" name="objs"/>
+					<stat_bar label="Obiekty w cache" name="cachedobjs"/>
 					<stat_bar label="Nowe obiekty" name="newobjs"/>
 					<stat_bar name="object_cache_hits" label="Wspł. trafień obiektów do cache"/>
 					<stat_bar name="occlusion_queries" label="Ilość wywołań okluzji"/>
diff --git a/indra/newview/skins/starlightcui/xui/en/sidepanel_inventory.xml b/indra/newview/skins/starlightcui/xui/en/sidepanel_inventory.xml
index ff555f7583..1a82f174b0 100644
--- a/indra/newview/skins/starlightcui/xui/en/sidepanel_inventory.xml
+++ b/indra/newview/skins/starlightcui/xui/en/sidepanel_inventory.xml
@@ -14,7 +14,7 @@
 		 follows="all"
 		 layout="topleft"
 		 left="0"
-		 name="sidepanel__inventory_panel"
+		 name="sidepanel_inventory_panel"
 		 top="0"
 		 label=""
 		 height="570"
diff --git a/indra/newview/skins/vintage/xui/en/sidepanel_inventory.xml b/indra/newview/skins/vintage/xui/en/sidepanel_inventory.xml
index 4bfd76b97c..01c9c38a4b 100644
--- a/indra/newview/skins/vintage/xui/en/sidepanel_inventory.xml
+++ b/indra/newview/skins/vintage/xui/en/sidepanel_inventory.xml
@@ -10,7 +10,7 @@
 		follows="all"
 		layout="topleft"
 		left="0"
-		name="sidepanel__inventory_panel"
+		name="sidepanel_inventory_panel"
 		top="0"
 		label=""
 		height="550"
diff --git a/indra/newview/skins/vintage/xui/es/sidepanel_inventory.xml b/indra/newview/skins/vintage/xui/es/sidepanel_inventory.xml
index d3225126fe..bf27ef06d3 100644
--- a/indra/newview/skins/vintage/xui/es/sidepanel_inventory.xml
+++ b/indra/newview/skins/vintage/xui/es/sidepanel_inventory.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8" standalone="yes"?>
 <panel label="Inventario" name="objects panel">
-	<panel name="sidepanel__inventory_panel">
+	<panel name="sidepanel_inventory_panel">
 		<tab_container name="inventory_tab_container">
 			<panel label="Inventario" name="panel_main_inventory"/>
 			<panel label="Marketplace" name="inbox_outbox_layout_panel">
diff --git a/indra/newview/skins/vintage/xui/pl/sidepanel_inventory.xml b/indra/newview/skins/vintage/xui/pl/sidepanel_inventory.xml
index 488aa627c3..89ff8a4777 100644
--- a/indra/newview/skins/vintage/xui/pl/sidepanel_inventory.xml
+++ b/indra/newview/skins/vintage/xui/pl/sidepanel_inventory.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8" standalone="yes"?>
 <panel label="Rzeczy" name="objects panel">
-	<panel name="sidepanel__inventory_panel">
+	<panel name="sidepanel_inventory_panel">
 		<tab_container name="inventory_tab_container">
 			<panel label="Szafa" name="panel_main_inventory" />
 			<panel label="Marketplace" name="inbox_outbox_layout_panel">

From 8e2f975b62ce6a44cb1c90ca7950fb90d902c834 Mon Sep 17 00:00:00 2001
From: Liny <liny.odell@phoenixviewer.com>
Date: Tue, 10 Jun 2014 19:09:50 -0700
Subject: [PATCH 3/3] Fix RelWithDebInfo compile breakage from merge.

---
 indra/newview/llfloaterscriptlimits.cpp | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/indra/newview/llfloaterscriptlimits.cpp b/indra/newview/llfloaterscriptlimits.cpp
index 777bc4dbf8..924be61bbc 100755
--- a/indra/newview/llfloaterscriptlimits.cpp
+++ b/indra/newview/llfloaterscriptlimits.cpp
@@ -63,7 +63,7 @@
 // dump responder replies to LL_INFOS() for debugging
 //#define DUMP_REPLIES_TO_LL_INFOS()
 
-#ifdef DUMP_REPLIES_TO_LL_INFOS()
+#ifdef DUMP_REPLIES_TO_LL_INFOS
 #include "llsdserialize.h"
 #include "llwindow.h"
 #endif