Fixed crash upon clicking media prim (disabled prim media control floater for now). Fleshed out media browser replacement (LLFloaterWebContent).

indra/newview/skins/default/xui/en-us/floater_web_content.xml

@@ -0,0 +1,152 @@
+<?xml version="1.0" encoding="utf-8" standalone="yes" ?>
+<floater
+ can_close="true"
+ can_drag_on_left="false"
+ can_minimize="true"
+ can_resize="true"
+ height="440"
+ min_height="140"
+ min_width="467"
+ name="floater_web_content"
+ rect_control="FloaterMediaRect"
+ title="Web Browser"
+ initial_mime_type="text/html"
+ width="820">
+  <layout_stack
+   
+    bottom="0"
+    follows="left|right|top|bottom"
+    left="5"
+    name="stack1"
+    top="-20"
+    mouse_opaque="false"
+    width="810">
+    <layout_panel
+      auto_resize="false"
+      bottom="0"
+      height="25"
+      left="0"
+      name="nav_controls"
+      user_resize="false"
+      mouse_opaque="false"
+      width="815">
+      <button
+        bottom="0"
+        follows="left|top"
+	height="25"
+	label=""
+	image_overlay="go-previous-4.png"
+	left="0"
+	name="back"
+        width="25" >
+        <button.commit_callback
+          function="WebContent.Back" />
+        </button>
+        <button
+        bottom_delta="0"
+	follows="left|top"
+	height="25" label=""
+	image_overlay="go-next-4.png"
+	left_delta="27"
+        name="forward"
+	width="25" >
+        <button.commit_callback
+          function="WebContent.Forward" />
+        </button>
+      <button
+        bottom_delta="0"
+	enabled="true"
+	follows="left|top"
+	height="25"
+	label=""
+	image_overlay="media_btn_stoploading.png"
+	name="stop"
+	left_delta="27"
+	width="25">
+        <button.commit_callback
+          function="WebContent.Stop" />
+      </button>
+      <button
+        bottom_delta="0"
+	follows="left|top"
+	height="25"
+	label=""
+	image_overlay="view-refresh-5.png" 
+	name="reload"
+	left_delta="0"
+	width="25" >
+        <button.commit_callback
+          function="WebContent.Reload" />
+      </button>
+      <combo_box
+        allow_text_entry="true"
+	
+	follows="left|top|right"
+	height="20"
+        left_delta="29"
+	max_chars="1024"
+	name="address"
+	select_all_on_focus_received="true"
+	bottom_delta="4"
+	width="706">
+        <combo_box.commit_callback
+          function="WebContent.EnterAddress" />
+      </combo_box>
+      <button
+        bottom_delta="-4"
+	follows="right|top"
+	enabled="true" 
+	height="25"
+	label=""
+	image_overlay="media_btn_newwindow.png"
+	left_delta="709"
+	name="popexternal"
+	width="25">
+        <button.commit_callback
+          function="WebContent.PopExternal" />
+      </button>
+    </layout_panel>
+    <layout_panel
+      
+      bottom="0"
+      height="20"
+      left="0"
+      name="external_controls"
+      auto_resize="true"
+      user_resize="false"
+      width="540">
+      <web_browser
+        bottom="0"
+	follows="left|right|top|bottom"
+	left="0"
+	name="webbrowser"
+	border_visible="false"
+	top="20"
+	width="540" />
+    </layout_panel>
+    <layout_panel name="status_bar" 
+                  height="23"
+		  mouse_opaque="false"
+                  auto_resize="false">
+      <text
+        type="string"
+        length="200"
+        follows="bottom|left"
+        height="20"
+	bottom="2"
+        left_delta="0"
+        name="statusbartext"
+        parse_urls="false"
+        width="495"/>
+      <progress_bar
+        color_bar="0.3 1.0 0.3 1"
+        follows="bottom|right"
+        height="16"
+	left="715"
+        bottom_delta="5"
+        left_pad="24"
+        name="statusbarprogress"
+        width="64"/>
+    </layout_panel>
+  </layout_stack>
+</floater>

indra/newview/skins/default/xui/en-us/panel_login.xml

@@ -62,12 +62,12 @@
 	     left="475" mouse_opaque="true" name="start_location_text" v_pad="0" width="120">
 		Start Location:
 	</text>
-	<combo_box allow_text_entry="true" bottom_delta="0" left="475" follows="left|bottom" height="20"
+	<combo_box allow_text_entry="true" bottom_delta="-24" left="475" follows="left|bottom" height="20"
 	     max_chars="128" mouse_opaque="true" name="start_location_combo" width="155">
-		<combo_item name="MyHome" value="My Home">
+		<combo_item name="MyHome" value="home">
 			My Home
 		</combo_item>
-		<combo_item name="MyLastLocation" value="My Last Location">
+		<combo_item name="MyLastLocation" value="last">
 			My Last Location
 		</combo_item>
 		<combo_item name="Typeregionname" value="&lt;Type region name&gt;">

indra/newview/skins/default/xui/en-us/panel_preferences_audio.xml

@@ -5,7 +5,7 @@
 	<text bottom="-300" height="12" name="audio_prefs_text">Audio Preferences:</text>
 	<panel border="true" bottom="-200" filename="panel_audio.xml" height="165" label="Volume" left="142" name="Volume Panel" width="260"/>
 	<check_box bottom="-220" control_name="AudioStreamingMusic" height="16" initial_value="true" label="Play Streaming Music When Available (uses more bandwidth)" left="142" name="streaming_music"/>
-	<check_box bottom_delta="-20" control_name="AudioStreamingVideo" follows="top" height="16" initial_value="true" label="Play Streaming Media When Available (uses more bandwidth)" name="streaming_video"/>
+	<check_box bottom_delta="-20" control_name="AudioStreamingMedia" follows="top" height="16" initial_value="true" label="Play Streaming Media When Available (uses more bandwidth)" name="streaming_video"/>
 	<check_box bottom_delta="-20" control_name="ParcelMediaAutoPlayEnable" follows="top" height="16" initial_value="true" label="Automatically play media" left="162" name="auto_streaming_video"/>
 	<check_box bottom_delta="-20" control_name="MediaEnableFilter" follows="top" height="16" initial_value="true" label="Ask for permission (enables filtering)" name="streaming_video"/>
 	<check_box bottom_delta="-25" control_name="MuteWhenMinimized" follows="top" height="16" initial_value="true" label="Mute Audio When Window Minimized" left="142" name="mute_when_minimized"/>