EXT-490 Voice device settings unsaved

EXT-466 Statistics window is empty
EXT-488 Minimap does not open

4 files changed, 673 insertions, 2 deletions

diff --git a/indra/newview/llfloatervoicedevicesettings.cpp b/indra/newview/llfloatervoicedevicesettings.cpp
index fa76bb728d..37da4a6ba6 100644
--- a/indra/newview/llfloatervoicedevicesettings.cpp
+++ b/indra/newview/llfloatervoicedevicesettings.cpp
@@ -311,6 +311,7 @@ void LLFloaterVoiceDeviceSettings::onClose()
 {
 	if(mDevicePanel)
 	{
+		mDevicePanel->apply();
 		mDevicePanel->cleanup();
 	}
 }
diff --git a/indra/newview/skins/default/xui/en/floater_stats.xml b/indra/newview/skins/default/xui/en/floater_stats.xml
index 08d91843f2..4d7da97f79 100644
--- a/indra/newview/skins/default/xui/en/floater_stats.xml
+++ b/indra/newview/skins/default/xui/en/floater_stats.xml
@@ -25,6 +25,668 @@
          left="2"
          name="statistics_view"
          top="20"
-         width="230" />
+         width="230" >
+		  <stat_view
+			 name="basic"
+			 label="Basic"
+			 show_label="true"
+			 setting="OpenDebugStatBasic">
+			<stat_bar
+			   name="fps"
+			   label="FPS"
+			   unit_label="fps"
+			   stat="fpsstat"
+			   bar_min="0"
+			   bar_max="45"
+			   tick_spacing="7.5"
+			   label_spacing="15.0"
+			   precision="1"
+			   show_bar="true"
+			   show_history="true">
+			</stat_bar>
+			<stat_bar
+			   name="bandwidth"
+			   label="Bandwidth"
+			   unit_label="kbps"
+			   stat="kbitstat"
+			   bar_min="0"
+			   bar_max="900"
+			   tick_spacing="100"
+			   label_spacing="300"
+			   show_bar="true"
+			   show_history="false">
+			</stat_bar>
+			<stat_bar
+			   name="packet_loss"
+			   label="Packet Loss"
+			   unit_label=" %"
+			   stat="packetslostpercentstat"
+			   bar_min="0"
+			   bar_max="5"
+			   tick_spacing="1"
+			   label_spacing="1"
+			   precision="1"
+			   show_per_sec="false"
+			   show_bar="false"
+			   show_mean="true">
+			</stat_bar>
+			<stat_bar
+			   name="ping"
+			   label="Ping Sim"
+			   unit_label="msec"
+			   stat="simpingstat"
+			   bar_min="0"
+			   bar_max="1000"
+			   tick_spacing="100"
+			   label_spacing="200"
+			   show_bar="false"
+			   show_per_sec="false"
+			   show_mean="false">
+			</stat_bar>
+		  </stat_view>
+		  <stat_view
+			 name="advanced"
+			 label="Advanced"
+			 show_label="true"
+			 setting="OpenDebugStatAdvanced">
+			<stat_view
+			   name="render"
+			   label="Render"
+			   show_label="true"
+			   setting="OpenDebugStatRender">
+			  <stat_bar
+				 name="ktrisframe"
+				 label="KTris Drawn"
+				 unit_label="/fr"
+				 stat="trianglesdrawnstat"
+				 bar_min="0"
+				 bar_max="500"
+				 tick_spacing="100"
+				 label_spacing="500"
+				 precision="1"
+				 show_per_sec="false">
+			  </stat_bar>
+			  <stat_bar
+				 name="ktrissec"
+				 label="KTris Drawn"
+				 unit_label="/sec"
+				 stat="trianglesdrawnstat"
+				 bar_min="0"
+				 bar_max="3000"
+				 tick_spacing="250"
+				 label_spacing="1000"
+				 precision="1">
+			  </stat_bar>
+			  <stat_bar
+				 name="objs"
+				 label="Total Objects"
+				 unit_label=""
+				 stat="numobjectsstat"
+				 bar_min="0"
+				 bar_max="3000"
+				 tick_spacing="250"
+				 label_spacing="1000"
+				 precision="1"
+				 show_per_sec="false"
+				 show_bar="false">
+			  </stat_bar>
+			  <stat_bar
+				 name="newobjs"
+				 label="New Objects"
+				 unit_label="/sec"
+				 stat="numnewobjectsstat"
+				 bar_min="0"
+				 bar_max="1000"
+				 tick_spacing="100"
+				 label_spacing="500"
+				 show_per_sec="true"
+				 show_bar="false">
+			  </stat_bar>
+			</stat_view>
+			<stat_view
+			   name="texture"
+			   label="Texture"
+			   show_label="true">
+			  <stat_bar
+				 name="numimagesstat"
+				 label="Count"
+				 stat="numimagesstat" 
+				 bar_min="0.f"
+				 bar_max="8000.f" 
+				 tick_spacing="2000.f"
+				 label_spacing="4000.f" 
+				 show_per_sec="false"
+				 show_bar="false">
+			  </stat_bar>
+
+			  <stat_bar
+				 name="numrawimagesstat"
+				 label="Raw Count"
+				 stat="numrawimagesstat"
+				 bar_min="0.f"
+				 bar_max="8000.f" 
+				 tick_spacing="2000.f"
+				 label_spacing="4000.f" 
+				 show_per_sec="false"
+				 show_bar="false">
+			  </stat_bar>
+
+			  <stat_bar
+				 name="gltexmemstat"
+				 label="GL Mem"
+				 stat="gltexmemstat"
+				 bar_min="0.f"
+				 bar_max="400.f" 
+				 tick_spacing="100.f"
+				 label_spacing="200.f" 
+				 precision="1"
+				 show_per_sec="false" >
+			  </stat_bar>
+
+			  <stat_bar
+				 name="formattedmemstat"
+				 label="Formatted Mem"
+				 stat="formattedmemstat"
+				 bar_min="0.f"
+				 bar_max="400.f" 
+				 tick_spacing="100.f"
+				 label_spacing="200.f" 
+				 precision="1"
+				 show_per_sec="false" >
+			  </stat_bar>
+
+			  <stat_bar
+				 name="rawmemstat"
+				 label="Raw Mem"
+				 stat="rawmemstat"
+				 bar_min="0.f"
+				 bar_max="400.f" 
+				 tick_spacing="100.f"
+				 label_spacing="200.f" 
+				 precision="1"
+				 show_per_sec="false" >
+			  </stat_bar>
+
+			  <stat_bar
+				 name="glboundmemstat"
+				 label="Bound Mem"
+				 stat="glboundmemstat"
+				 bar_min="0.f"
+				 bar_max="400.f" 
+				 tick_spacing="100.f"
+				 label_spacing="200.f" 
+				 precision="1"
+				 show_per_sec="false" >
+			  </stat_bar>
+			</stat_view>
+
+			<stat_view
+			   name="network"
+			   label="Network"
+			   show_label="true"
+			   setting="OpenDebugStatNet">
+			  <stat_bar
+				 name="packetsinstat"
+				 label="Packets In"
+				 stat="packetsinstat"
+				 unit_label="/sec" 
+				 show_bar="false">
+			  </stat_bar>
+
+			  <stat_bar
+				 name="packetsoutstat"
+				 label="Packets Out"
+				 stat="packetsoutstat"
+				 unit_label="/sec" 
+				 show_bar="false" >
+			  </stat_bar>
+
+			  <stat_bar
+				 name="objectkbitstat"
+				 label="Objects"
+				 stat="objectkbitstat"
+				 unit_label="kbps"
+				 show_bar="false" >
+			  </stat_bar>
+
+			  <stat_bar
+				 name="texturekbitstat"
+				 label="Texture"
+				 stat="texturekbitstat"
+				 unit_label="kbps"
+				 show_bar="false" >
+			  </stat_bar>
+
+			  <stat_bar
+				 name="assetkbitstat"
+				 label="Asset"
+				 stat="assetkbitstat"
+				 unit_label="kbps"
+				 show_bar="false" >
+			  </stat_bar>
+
+			  <stat_bar
+				 name="layerskbitstat"
+				 label="Layers"
+				 stat="layerskbitstat"
+				 unit_label="kbps"
+				 show_bar="false" >
+			  </stat_bar>
+
+			  <stat_bar
+				 name="actualinkbitstat"
+				 label="Actual In"
+				 stat="actualinkbitstat"
+				 unit_label="kbps"
+				 bar_min="0.f"
+				 bar_max="1024.f" 
+				 tick_spacing="128.f"
+				 label_spacing="256.f" 
+				 show_bar="true"
+				 show_history="false" >
+			  </stat_bar>
+
+			  <stat_bar
+				 name="actualoutkbitstat"
+				 label="Actual Out"
+				 stat="actualoutkbitstat"
+				 unit_label="kbps"
+				 bar_min="0.f"
+				 bar_max="512.f" 
+				 tick_spacing="128.f"
+				 label_spacing="256.f" 
+				 show_bar="true"
+				 show_history="false">
+			  </stat_bar>
+
+			  <stat_bar
+				 name="vfspendingoperations"
+				 label="VFS Pending Ops"
+				 stat="vfspendingoperations"
+				 unit_label=" "
+				 show_per_sec="false"
+				 show_bar="false" >
+			  </stat_bar>
+			</stat_view>
+		  </stat_view>
+
+		  <stat_view
+			 name="sim"
+			 label="Simulator"
+			 show_label="true"
+			 setting="OpenDebugStatSim">
+			<stat_bar
+			   name="simtimedilation"
+			   label="Time Dilation"
+			   stat="simtimedilation"
+			   precision="2"
+			   bar_min="0.f"
+			   bar_max="1.f" 
+			   tick_spacing="0.25f"
+			   label_spacing="0.5f" 
+			   show_per_sec="false"
+			   show_bar="false"
+			   show_mean="false" >
+			</stat_bar>
+
+			<stat_bar
+			   name="simfps"
+			   label="Sim FPS"
+			   stat="simfps"
+			   bar_min="0.f"
+			   bar_max="200.f" 
+			   tick_spacing="20.f"
+			   label_spacing="100.f" 
+			   show_per_sec="false"
+			   show_bar="false"
+			   show_mean="false" >
+			</stat_bar>
+
+			<stat_bar
+			   name="simphysicsfps"
+			   label="Physics FPS"
+			   stat="simphysicsfps"
+			   precision="1"
+			   bar_min="0.f"
+			   bar_max="66.f" 
+			   tick_spacing="33.f"
+			   label_spacing="33.f" 
+			   show_per_sec="false"
+			   show_bar="false"
+			   show_mean="false" >
+			</stat_bar>
+
+			<stat_view
+			   name="physicsdetail"
+			   label="Physics Details"
+			   show_label="true"
+			   display_children="false">
+			  <stat_bar
+				 name="physicspinnedtasks"
+				 label="Pinned Objects"
+				 stat="physicspinnedtasks"
+				 precision="0" 
+				 bar_min="0.f"
+				 bar_max="500.f" 
+				 tick_spacing="10.f"
+				 label_spacing="40.f" 
+				 show_per_sec="false"
+				 show_bar="false"
+				 show_mean="false" >
+			  </stat_bar>
+
+			  <stat_bar
+				 name="physicslodtasks"
+				 label="Low LOD Objects"
+				 stat="physicslodtasks"
+				 precision="0"
+				 bar_min="0.f"
+				 bar_max="500.f" 
+				 tick_spacing="10.f"
+				 label_spacing="40.f" 
+				 show_per_sec="false"
+				 show_bar="false"
+				 show_mean="false" >
+			  </stat_bar>
+
+			  <stat_bar
+				 name="physicsmemoryallocated"
+				 label="Memory Allocated"
+				 stat="physicsmemoryallocated"
+				 unit_label="MB"
+				 precision="0"
+				 bar_min="0.f"
+				 bar_max="1024.f" 
+				 tick_spacing="128.f"
+				 label_spacing="256.f" 
+				 show_per_sec="false"
+				 show_bar="false"
+				 show_mean="false" >
+			  </stat_bar>
+
+			  <stat_bar
+				 name="simagentups"
+				 label="Agent Updates/Sec"
+				 stat="simagentups"
+				 precision="1"
+				 bar_min="0.f"
+				 bar_max="100.f" 
+				 tick_spacing="25.f"
+				 label_spacing="50.f" 
+				 show_per_sec="false"
+				 show_bar="false"
+				 show_mean="false" >
+			  </stat_bar>
+
+			  <stat_bar
+				 name="simmainagents"
+				 label="Main Agents"
+				 stat="simmainagents"
+				 precision="0"
+				 bar_min="0.f"
+				 bar_max="80.f" 
+				 tick_spacing="10.f"
+				 label_spacing="40.f" 
+				 show_per_sec="false"
+				 show_bar="false"
+				 show_mean="false" >
+			  </stat_bar>
+
+			  <stat_bar
+				 name="simchildagents"
+				 label="Child Agents"
+				 stat="simchildagents"
+				 precision="0"
+				 bar_min="0.f"
+				 bar_max="40.f" 
+				 tick_spacing="5.f"
+				 label_spacing="10.f" 
+				 show_per_sec="false"
+				 show_bar="false"
+				 show_mean="false" >
+			  </stat_bar>
+
+			  <stat_bar
+				 name="simobjects"
+				 label="Objects"
+				 stat="simobjects"
+				 precision="0"
+				 bar_min="0.f"
+				 bar_max="30000.f" 
+				 tick_spacing="5000.f"
+				 label_spacing="10000.f" 
+				 show_per_sec="false"
+				 show_bar="false"
+				 show_mean="false" >
+			  </stat_bar>
+
+			  <stat_bar
+				 name="simactiveobjects"
+				 label="Active Objects"
+				 stat="simactiveobjects"
+				 precision="0"
+				 bar_min="0.f"
+				 bar_max="800.f" 
+				 tick_spacing="100.f"
+				 label_spacing="200.f" 
+				 show_per_sec="false"
+				 show_bar="false"
+				 show_mean="false" >
+			  </stat_bar>
+
+			  <stat_bar
+				 name="simactivescripts"
+				 label="Active Scripts"
+				 stat="simactivescripts"
+				 precision="0"
+				 bar_min="0.f"
+				 bar_max="800.f" 
+				 tick_spacing="100.f"
+				 label_spacing="200.f" 
+				 show_per_sec="false"
+				 show_bar="false"
+				 show_mean="false" >
+			  </stat_bar>
+
+			  <stat_bar
+				 name="simscripteps"
+				 label="Script Events"
+				 stat="simscripteps"
+				 unit_label="eps"
+				 precision="0"
+				 bar_min="0.f"
+				 bar_max="20000.f" 
+				 tick_spacing="2500.f"
+				 label_spacing="5000.f" 
+				 show_per_sec="false"
+				 show_bar="false"
+				 show_mean="false" >
+			  </stat_bar>
+
+			  <stat_bar
+				 name="siminpps"
+				 label="Packets In"
+				 stat="siminpps"
+				 unit_label="pps"
+				 precision="0"
+				 bar_min="0.f"
+				 bar_max="2000.f" 
+				 tick_spacing="250.f"
+				 label_spacing="1000.f" 
+				 show_per_sec="false"
+				 show_bar="false"
+				 show_mean="false" >
+			  </stat_bar>
+
+			  <stat_bar
+				 name="simoutpps"
+				 label="Packets Out"
+				 stat="simoutpps"
+				 unit_label="pps" 
+				 precision="0"
+				 bar_min="0.f"
+				 bar_max="2000.f" 
+				 tick_spacing="250.f"
+				 label_spacing="1000.f" 
+				 show_per_sec="false"
+				 show_bar="false"
+				 show_mean="false" >
+			  </stat_bar>
+
+			  <stat_bar
+				 name="simpendingdownloads"
+				 label="Pending Downloads"
+				 stat="simpendingdownloads"
+				 precision="0"
+				 bar_min="0.f"
+				 bar_max="800.f" 
+				 tick_spacing="100.f"
+				 label_spacing="200.f" 
+				 show_per_sec="false"
+				 show_bar="false"
+				 show_mean="false" >
+			  </stat_bar>
+
+			  <stat_bar
+				 name="simpendinguploads"
+				 label="Pending Uploads"
+				 stat="simpendinguploads"
+				 precision="0"
+				 bar_min="0.f"
+				 bar_max="100.f" 
+				 tick_spacing="25.f"
+				 label_spacing="50.f" 
+				 show_per_sec="false"
+				 show_bar="false"
+				 show_mean="false" >
+			  </stat_bar>
+
+			  <stat_bar
+				 name="simtotalunackedbytes"
+				 label="Total Unacked Bytes"
+				 stat="simtotalunackedbytes"
+				 unit_label="kb"
+				 precision="0"
+				 bar_min="0.f"
+				 bar_max="100000.f" 
+				 tick_spacing="25000.f"
+				 label_spacing="50000.f" 
+				 show_per_sec="false"
+				 show_bar="false"
+				 show_mean="false" >
+			  </stat_bar>
+			</stat_view>
+
+			<stat_view
+			   name="simperf"
+			   label="Time (ms)"
+			   show_label="true">
+			  <stat_bar
+				 name="simframemsec"
+				 label="Total Frame Time"
+				 stat="simframemsec"
+				 unit_label="ms"
+				 precision="1"
+				 bar_min="0.f"
+				 bar_max="40.f" 
+				 tick_spacing="10.f"
+				 label_spacing="20.f" 
+				 show_per_sec="false"
+				 show_bar="false"
+				 show_mean="false" >
+			  </stat_bar>
+
+			  <stat_bar
+				 name="simnetmsec"
+				 label="Net Time"
+				 stat="simnetmsec"
+				 unit_label="ms"
+				 precision="1"
+				 bar_min="0.f"
+				 bar_max="40.f" 
+				 tick_spacing="10.f"
+				 label_spacing="20.f" 
+				 show_per_sec="false"
+				 show_bar="false"
+				 show_mean="false" >
+			  </stat_bar>
+
+			  <stat_bar
+				 name="simsimphysicsmsec"
+				 label="Physics Time"
+				 stat="simsimphysicsmsec"
+				 unit_label="ms"
+				 precision="1"
+				 bar_min="0.f"
+				 bar_max="40.f" 
+				 tick_spacing="10.f"
+				 label_spacing="20.f" 
+				 show_per_sec="false"
+				 show_bar="false"
+				 show_mean="false" >
+			  </stat_bar>
+
+			  <stat_bar
+				 name="simsimothermsec"
+				 label="Simulation Time"
+				 stat="simsimothermsec"
+				 unit_label="ms"
+				 precision="1"
+				 bar_min="0.f"
+				 bar_max="40.f" 
+				 tick_spacing="10.f"
+				 label_spacing="20.f" 
+				 show_per_sec="false"
+				 show_bar="false"
+				 show_mean="false" >
+			  </stat_bar>
+
+			  <stat_bar
+				 name="simagentmsec"
+				 label="Agent Time"
+				 stat="simagentmsec"
+				 unit_label="ms"
+				 precision="1"
+				 bar_min="0.f"
+				 bar_max="40.f" 
+				 tick_spacing="10.f"
+				 label_spacing="20.f" 
+				 show_per_sec="false"
+				 show_bar="false"
+				 show_mean="false" >
+			  </stat_bar>
+
+			  <stat_bar
+				 name="simimagesmsec"
+				 label="Images Time"
+				 stat="simimagesmsec"
+				 unit_label="ms"
+				 precision="1"
+				 bar_min="0.f"
+				 bar_max="40.f" 
+				 tick_spacing="10.f"
+				 label_spacing="20.f" 
+				 show_per_sec="false"
+				 show_bar="false"
+				 show_mean="false" >
+			  </stat_bar>
+
+			  <stat_bar
+				 name="simscriptmsec"
+				 label="Script Time"
+				 stat="simscriptmsec"
+				 unit_label="ms"
+				 precision="1"
+				 bar_min="0.f"
+				 bar_max="40.f" 
+				 tick_spacing="10.f"
+				 label_spacing="20.f" 
+				 show_per_sec="false"
+				 show_bar="false"
+				 show_mean="false" >
+			  </stat_bar>
+			</stat_view>
+		  </stat_view>
+		</container_view>
     </scroll_container>
 </floater>
diff --git a/indra/newview/skins/default/xui/en/menu_viewer.xml b/indra/newview/skins/default/xui/en/menu_viewer.xml
index 31ef192de8..3d2558ce5a 100644
--- a/indra/newview/skins/default/xui/en/menu_viewer.xml
+++ b/indra/newview/skins/default/xui/en/menu_viewer.xml
@@ -352,7 +352,8 @@
             <menu_item_check.on_check
              function="Floater.Visible"
 			 parameter="mini_map" />
-            <menu_item_check.on_clickde
+            <menu_item_check.on_click
+             function="Floater.Toggle"
              parameter="mini_map" />
         </menu_item_check>
         <menu_item_separator
diff --git a/indra/newview/skins/default/xui/en/panel_notes.xml b/indra/newview/skins/default/xui/en/panel_notes.xml
index 016aa64927..188f405e13 100644
--- a/indra/newview/skins/default/xui/en/panel_notes.xml
+++ b/indra/newview/skins/default/xui/en/panel_notes.xml
@@ -19,6 +19,12 @@
      opaque="true"
      top="0"
      width="284">
+      <panel
+		 height="350"
+		 layout="topleft"
+		 name="profile_scroll_panel"
+		 top="0"
+		 width="284">
         <text
          follows="left|top"
          font="SansSerifBold"
@@ -80,6 +86,7 @@
          name="objects_check"
          top_pad="0"
          width="230" />
+      </panel>
     </scroll_container>
     <panel
      follows="bottom|left"