merge

5 files changed, 379 insertions, 244 deletions

diff --git a/indra/newview/skins/default/xui/en/floater_model_wizard.xml b/indra/newview/skins/default/xui/en/floater_model_wizard.xml
index e2ec557b06..d8492a10bb 100644
--- a/indra/newview/skins/default/xui/en/floater_model_wizard.xml
+++ b/indra/newview/skins/default/xui/en/floater_model_wizard.xml
@@ -190,21 +190,49 @@
 			<text
 			 top_pad="10"
 			 width="130"
-			 height="15"
+			 height="14"
 			 left="340"
 			 text_color="White"
 			 word_wrap="true">
 				Dimensions (meters):
 			</text>
 			<text
-			 top_pad="2"
+			 top_pad="0"
 			 width="160"
 			 height="15"
-			 name="import_dimensions"
+			 font="SansSerifSmallBold" 
+			 text_color="White"
+			 name="dimensions"
 			 left_delta="0">
-				X:  [X] |Y:  [Y] |Z: [Z]
+				X:         Y:         Z: 
 			</text>
 			<text
+			 top_delta="0"
+			 width="160"
+			 height="15"
+			 name="dimension_dividers"
+			 left_delta="41">
+				 |               |   
+			</text>
+			<text
+			 top_delta="0"
+			 width="160"
+			 height="15"
+			 name="dimension_x"
+			 left="356"/>
+			<text
+			 top_delta="0"
+			 width="160"
+			 height="15"
+			 name="dimension_y"
+			 left="403"/>
+			<text
+			 top_delta="0"
+			 width="160"
+			 height="15"
+			 name="dimension_z"
+			 left="450"/>
+			<text
 			 top="100"
 			 width="320"
 			 height="15"
@@ -397,29 +425,66 @@ Advanced users familiar with 3d content creation tools may prefer to use the [se
 		   width="290" />
 			<text 
 			font="SansSerifSmall" 
-			top_pad="1"  
+			top_pad="0"  
 			width="300" 
 			left_delta="6" 
 			height="4">'                                             '                                             '</text>
-			<text top_delta="25" width="100" text_color="White" left_delta="50"  height="20">Resource Cost:</text>
+
+
+			<icon
+				 top_pad="10"
+				 left_delta="0"
+				 width="280"
+				 height="2"
+				 image_name="model_wizard\divider_line.png"/>
+	
+			<text top_delta="25" width="200" text_color="White" left_delta="50" name="streaming cost"  height="20">Resource Cost:    [COST]</text>
 			<text top_delta="25" width="100" text_color="White" left_delta="0"  height="20">Upload Fee:</text>
 			<text
-			 top_pad="15"
-			 width="130"
-			 height="15"
-			 left="10"
-			 text_color="White"
-			 word_wrap="true">
+						 top_pad="5"
+						 width="130"
+						 height="14"
+						 left="10"
+						 text_color="White"
+						 word_wrap="true">
 				Dimensions (meters):
 			</text>
 			<text
 			 top_pad="0"
 			 width="160"
 			 height="15"
-			 name="import_dimensions"
+			 font="SansSerifSmallBold"
+			 text_color="White"
+			 name="dimensions"
 			 left_delta="0">
-				X:  [X] |Y:  [Y] |Z: [Z]
+				X:         Y:         Z:
+			</text>
+			<text
+			 top_delta="0"
+			 width="160"
+			 height="15"
+			 name="dimension_dividers"
+			 left_delta="41">
+				|               |
 			</text>
+			<text
+			 top_delta="0"
+			 width="160"
+			 height="15"
+			 name="dimension_x"
+			 left_delta="-25"/>
+			<text
+			 top_delta="0"
+			 width="160"
+			 height="15"
+			 name="dimension_y"
+			 left_delta="46"/>
+			<text
+			 top_delta="0"
+			 width="160"
+			 height="15"
+			 name="dimension_z"
+			 left_delta="46"/>
 		</panel>
 	</panel>
 
@@ -466,7 +531,7 @@ Advanced users familiar with 3d content creation tools may prefer to use the [se
     <panel
 		 top_delta="40"
 		 left="15"
-		 height="245"
+		 height="265"
 		 width="500"
 		 name="content"
 		 bg_opaque_color="DkGray2"
@@ -499,9 +564,18 @@ Advanced users familiar with 3d content creation tools may prefer to use the [se
       <text top_pad="10" width="110" halign="center" word_wrap="true" left="25"  height="40">Recommended for solid objects</text>
       <text top_delta="0" width="110" halign="center" word_wrap="true" left="190"  height="40">Recommended for buildings</text>
       <text top_delta="0" width="110" halign="center" word_wrap="true" left="350"  height="40">Recommended for vehicles</text>
-      <text top_delta="60" width="100" text_color="White" left="160"  height="20">Resource Cost:</text>
-      <text top_delta="20" width="100" text_color="White" left_delta="0"  height="20">Physics Cost:</text>
-      <text top_delta="20" width="100" text_color="White" left_delta="0"  height="20">Upload Fee:</text>
+
+
+		<icon
+			 top_pad="5"
+			 left="15"
+			 width="470"
+			 height="2"
+			 image_name="model_wizard\divider_line.png"/>
+		
+	<text top_delta="20" width="180" text_color="White" left="160" name="streaming cost"  height="20">Resource Cost:       [COST]</text>
+      <text top_delta="26" width="180" text_color="White" left_delta="0" name="physics cost"  height="20">Physics Cost:           [COST]</text>
+      <text top_delta="26" width="180" text_color="White" left_delta="0"  height="20">Upload Fee:</text>
  
     </panel>
 	</panel>
@@ -511,7 +585,7 @@ Advanced users familiar with 3d content creation tools may prefer to use the [se
 		 height="388"
 		 top_delta="0"
 		 name="review_panel"
-		 visible="false"
+		 visible="true"
 		 width="530"
 		 left="0">
 		<panel
@@ -538,7 +612,7 @@ Advanced users familiar with 3d content creation tools may prefer to use the [se
 		<text
 		 top_pad="14"
 		 width="460"
-		 height="20"
+		 height="24"
 		 font="SansSerifSmall"
 		 layout="topleft"
 		 name="description"
@@ -546,8 +620,14 @@ Advanced users familiar with 3d content creation tools may prefer to use the [se
 		 left_delta="10">
 			Review the details below then click. Upload to upload your model. Your L$ balance will be charged when you click Upload.
 		</text>
+		<icon
+			 top_pad="10"
+			 left="20"
+			 width="495"
+			 height="2"
+			 image_name="model_wizard\divider_line.png"/>
     <panel
-		 top_delta="40"
+		 top_pad="5"
 		 left="15"
 		 height="245"
 		 width="500"
@@ -555,7 +635,7 @@ Advanced users familiar with 3d content creation tools may prefer to use the [se
       <text top="10" left="10" width="85" text_color="White" follows="left|top" height="15" name="lod_label">
         Model Preview:
       </text>
-      <combo_box left_pad="5" top_delta="-2"  follows="left|top" list_position="below" height="18"
+      <combo_box left_pad="5" top_delta="-5"  follows="left|top" list_position="below" height="22"
 	     name="preview_lod_combo" width="90" tool_tip="LOD to view in preview render">
         <combo_item name="high">
           High
@@ -580,32 +660,61 @@ Advanced users familiar with 3d content creation tools may prefer to use the [se
 				 height="190"
 				 follows="all"
 				 width="190">
-			</panel>			
-      <text
-			 top_pad="8"
-			 width="130"
-			 height="15"
-			 left="10"
-			 text_color="White"
-			 word_wrap="true">
-				Dimensions (meters):
-			</text>
-      <text
-			 top_pad="0"
-			 width="160"
-			 height="15"
-			 name="import_dimensions"
-			 left_delta="0">
-        X:  [X] |Y:  [Y] |Z: [Z]
-      </text>
+			</panel>
+		<text
+					 top_pad="8"
+					 width="130"
+					 height="14"
+					 left="10"
+					 text_color="White"
+					 word_wrap="true">
+			Dimensions (meters):
+		</text>
+		<text
+		 top_pad="0"
+		 width="160"
+		 height="15"
+		 font="SansSerifSmallBold"
+		 text_color="White"
+		 name="dimensions"
+		 left_delta="0">
+			X:         Y:         Z:
+		</text>
+		<text
+		 top_delta="0"
+		 width="160"
+		 height="15"
+		 name="dimension_dividers"
+		 left_delta="41">
+			|               |
+		</text>
+		<text
+		 top_delta="0"
+		 width="160"
+		 height="15"
+		 name="dimension_x"
+		 left_delta="-25"/>
+		<text
+		 top_delta="0"
+		 width="160"
+		 height="15"
+		 name="dimension_y"
+		 left_delta="46"/>
+		<text
+		 top_delta="0"
+		 width="160"
+		 height="15"
+		 name="dimension_z"
+		 left_delta="46"/>
       </panel>
     <text
-      width="200"
+      width="300"
       height="12"
       top="125" 
+	  name="streaming cost" 
       left="230" 
       font="SansSerifSmallBold" 
-      text_color="White">Resource Cost:</text>
+      text_color="White">Resource Cost:         [COST]</text>
     <text
       width="285"
       height="30"
@@ -614,12 +723,13 @@ Advanced users familiar with 3d content creation tools may prefer to use the [se
       word_wrap="true"
       font="SansSerifItalic">This is the cost to your Region's prim/object limit, at default scale</text>
 	<text
-	 width="200"
+	 width="300"
 	 height="12"
+	 name="physics cost" 
 	 top_pad="10"
 		 left_delta="0"
 	 font="SansSerifSmallBold"
-	 text_color="White">Physics Cost:</text>
+	 text_color="White">Physics Cost:        [COST]</text>
 	<text
 	  width="285"
 	  height="30"
@@ -663,7 +773,7 @@ Advanced users familiar with 3d content creation tools may prefer to use the [se
 		 height="388"
 		 top_delta="0"
 		 name="upload_panel"
-		 visible="true"
+		 visible="false"
 		 width="530"
 		 left="0">
 		<panel
diff --git a/indra/newview/skins/default/xui/en/floater_web_content.xml b/indra/newview/skins/default/xui/en/floater_web_content.xml
index 2ad46824c2..d90d0feda9 100644
--- a/indra/newview/skins/default/xui/en/floater_web_content.xml
+++ b/indra/newview/skins/default/xui/en/floater_web_content.xml
@@ -1,190 +1,190 @@
-<?xml version="1.0" encoding="utf-8" standalone="yes" ?>

-<floater

-  legacy_header_height="18"

-  can_resize="true"

-  height="440"

-  layout="topleft"

-  min_height="140"

-  min_width="467"

-  name="floater_web_content"

-  help_topic="floater_web_content"

-  save_rect="true"

-  auto_tile="true"

-  title=""

-  initial_mime_type="text/html"

-  width="820">

-  <layout_stack

-    bottom="440"

-    follows="left|right|top|bottom"

-    layout="topleft"

-    left="5"

-    name="stack1"

-    orientation="vertical"

-    top="20"

-    width="810">

-    <layout_panel

-      auto_resize="false"

-      default_tab_group="1"

-      height="22"

-      layout="topleft"

-      left="0"

-      min_height="20"

-      name="nav_controls"

-      top="400"

-      user_resize="false"

-      width="800">

-      <button

-        image_overlay="Arrow_Left_Off"

-		    image_disabled="PushButton_Disabled"

-		    image_disabled_selected="PushButton_Disabled"

-		    image_selected="PushButton_Selected"

-		    image_unselected="PushButton_Off"

-		    hover_glow_amount="0.15"

-        tool_tip="Navigate back"

-        follows="left|top"

-        height="22"

-        layout="topleft"

-        left="1"

-        name="back"

-        top="0"

-        width="22">

-        <button.commit_callback

-          function="WebContent.Back" />

-      </button>

-      <button

-        image_overlay="Arrow_Right_Off"

-		    image_disabled="PushButton_Disabled"

-		    image_disabled_selected="PushButton_Disabled"

-		    image_selected="PushButton_Selected"

-		    image_unselected="PushButton_Off"

-        tool_tip="Navigate forward"

-        follows="left|top"

-        height="22"

-        layout="topleft"

-        left="27"

-        name="forward"

-        top_delta="0"

-        width="22">

-        <button.commit_callback

-          function="WebContent.Forward" />

-      </button>

-      <button

-        image_overlay="Stop_Off"

-		    image_disabled="PushButton_Disabled"

-		    image_disabled_selected="PushButton_Disabled"

-		    image_selected="PushButton_Selected"

-		    image_unselected="PushButton_Off"

-        tool_tip="Stop navigation"

-        enabled="true"

-        follows="left|top"

-        height="22"

-        layout="topleft"

-        left="51"

-        name="stop"

-        top_delta="0"

-        width="22">

-        <button.commit_callback

-          function="WebContent.Stop" />

-      </button>

-      <button

-        image_overlay="Refresh_Off"

-		    image_disabled="PushButton_Disabled"

-		    image_disabled_selected="PushButton_Disabled"

-		    image_selected="PushButton_Selected"

-		    image_unselected="PushButton_Off"

-        tool_tip="Reload page"

-        follows="left|top"

-        height="22"

-        layout="topleft"

-        left="51"

-        name="reload"

-        top_delta="0"

-        width="22">

-        <button.commit_callback

-          function="WebContent.Reload" />

-      </button>

-      <combo_box

-        allow_text_entry="true"

-        follows="left|top|right"

-        tab_group="1"

-        height="22"

-        layout="topleft"

-        left_pad="4"

-        max_chars="1024"

-        name="address"

-        combo_editor.select_on_focus="true"

-        tool_tip="Enter URL here"

-        top_delta="0"

-        width="702">

-        <combo_box.commit_callback

-          function="WebContent.EnterAddress" />

-      </combo_box>

-      <icon

-        name="media_secure_lock_flag"

-        height="16"

-        follows="top|right"

-        image_name="Lock2"

-        layout="topleft"

-        left_delta="656"

-        top_delta="2"

-        visible="false" 

-        tool_tip="Secured Browsing"

-        width="16" />

-      <button

-        image_overlay="ExternalBrowser_Off"

-		    image_disabled="PushButton_Disabled"

-		    image_disabled_selected="PushButton_Disabled"

-		    image_selected="PushButton_Selected"

-		    image_unselected="PushButton_Off"

-        tool_tip="Open current URL in your desktop browser"

-        follows="right|top"

-        enabled="true" 

-        height="22"

-        layout="topleft"

-        name="popexternal"

-        right="800"

-        top_delta="-2"

-        width="22">

-        <button.commit_callback

-          function="WebContent.PopExternal" />

-      </button>

-    </layout_panel>

-    <layout_panel

-      height="40"

-      layout="topleft"

-      left_delta="0"

-      name="external_controls"

-      top_delta="0"

-      user_resize="false"

-      width="540">

-      <web_browser

-        bottom="-22"

-        follows="all"

-        layout="topleft"

-        left="0"

-        name="webbrowser"

-        top="0"/>

-      <text

-        type="string"

-        length="100"

-        follows="bottom|left"

-        height="20"

-        layout="topleft"

-        left_delta="0"

-        name="statusbartext"

-        parse_urls="false"

-        text_color="0.4 0.4 0.4 1" 

-        top_pad="5"

-        width="452"/>

-      <progress_bar

-        color_bar="0.3 1.0 0.3 1"

-        follows="bottom|right"

-        height="16"

-        top_delta="-1"

-        left_pad="24"

-        layout="topleft"

-        name="statusbarprogress"

-        width="64"/>

-    </layout_panel>

-  </layout_stack>

-</floater>

+<?xml version="1.0" encoding="utf-8" standalone="yes" ?>
+<floater
+  legacy_header_height="18"
+  can_resize="true"
+  height="440"
+  layout="topleft"
+  min_height="140"
+  min_width="467"
+  name="floater_web_content"
+  help_topic="floater_web_content"
+  save_rect="true"
+  auto_tile="true"
+  title=""
+  initial_mime_type="text/html"
+  width="820">
+  <layout_stack
+    bottom="440"
+    follows="left|right|top|bottom"
+    layout="topleft"
+    left="5"
+    name="stack1"
+    orientation="vertical"
+    top="20"
+    width="810">
+    <layout_panel
+      auto_resize="false"
+      default_tab_group="1"
+      height="22"
+      layout="topleft"
+      left="0"
+      min_height="20"
+      name="nav_controls"
+      top="400"
+      user_resize="false"
+      width="800">
+      <button
+        image_overlay="Arrow_Left_Off"
+        image_disabled="PushButton_Disabled"
+        image_disabled_selected="PushButton_Disabled"
+        image_selected="PushButton_Selected"
+        image_unselected="PushButton_Off"
+        hover_glow_amount="0.15"
+        tool_tip="Navigate back"
+        follows="left|top"
+        height="22"
+        layout="topleft"
+        left="1"
+        name="back"
+        top="0"
+        width="22">
+        <button.commit_callback
+          function="WebContent.Back" />
+      </button>
+      <button
+        image_overlay="Arrow_Right_Off"
+        image_disabled="PushButton_Disabled"
+        image_disabled_selected="PushButton_Disabled"
+        image_selected="PushButton_Selected"
+        image_unselected="PushButton_Off"
+        tool_tip="Navigate forward"
+        follows="left|top"
+        height="22"
+        layout="topleft"
+        left="27"
+        name="forward"
+        top_delta="0"
+        width="22">
+        <button.commit_callback
+          function="WebContent.Forward" />
+      </button>
+      <button
+        image_overlay="Stop_Off"
+        image_disabled="PushButton_Disabled"
+        image_disabled_selected="PushButton_Disabled"
+        image_selected="PushButton_Selected"
+        image_unselected="PushButton_Off"
+        tool_tip="Stop navigation"
+        enabled="true"
+        follows="left|top"
+        height="22"
+        layout="topleft"
+        left="51"
+        name="stop"
+        top_delta="0"
+        width="22">
+        <button.commit_callback
+          function="WebContent.Stop" />
+      </button>
+      <button
+        image_overlay="Refresh_Off"
+        image_disabled="PushButton_Disabled"
+        image_disabled_selected="PushButton_Disabled"
+        image_selected="PushButton_Selected"
+        image_unselected="PushButton_Off"
+        tool_tip="Reload page"
+        follows="left|top"
+        height="22"
+        layout="topleft"
+        left="51"
+        name="reload"
+        top_delta="0"
+        width="22">
+        <button.commit_callback
+          function="WebContent.Reload" />
+      </button>
+      <combo_box
+        allow_text_entry="true"
+        follows="left|top|right"
+        tab_group="1"
+        height="22"
+        layout="topleft"
+        left_pad="4"
+        max_chars="1024"
+        name="address"
+        combo_editor.select_on_focus="true"
+        tool_tip="Enter URL here"
+        top_delta="0"
+        width="702">
+        <combo_box.commit_callback
+          function="WebContent.EnterAddress" />
+      </combo_box>
+      <icon
+        name="media_secure_lock_flag"
+        height="16"
+        follows="top|right"
+        image_name="Lock2"
+        layout="topleft"
+        left_delta="656"
+        top_delta="2"
+        visible="false" 
+        tool_tip="Secured Browsing"
+        width="16" />
+      <button
+        image_overlay="ExternalBrowser_Off"
+        image_disabled="PushButton_Disabled"
+        image_disabled_selected="PushButton_Disabled"
+        image_selected="PushButton_Selected"
+        image_unselected="PushButton_Off"
+        tool_tip="Open current URL in your desktop browser"
+        follows="right|top"
+        enabled="true" 
+        height="22"
+        layout="topleft"
+        name="popexternal"
+        right="800"
+        top_delta="-2"
+        width="22">
+        <button.commit_callback
+          function="WebContent.PopExternal" />
+      </button>
+    </layout_panel>
+    <layout_panel
+      height="40"
+      layout="topleft"
+      left_delta="0"
+      name="external_controls"
+      top_delta="0"
+      user_resize="false"
+      width="540">
+      <web_browser
+        bottom="-22"
+        follows="all"
+        layout="topleft"
+        left="0"
+        name="webbrowser"
+        top="0"/>
+      <text
+        type="string"
+        length="100"
+        follows="bottom|left"
+        height="20"
+        layout="topleft"
+        left_delta="0"
+        name="statusbartext"
+        parse_urls="false"
+        text_color="0.4 0.4 0.4 1" 
+        top_pad="5"
+        width="452"/>
+      <progress_bar
+        color_bar="0.3 1.0 0.3 1"
+        follows="bottom|right"
+        height="16"
+        top_delta="-1"
+        left_pad="24"
+        layout="topleft"
+        name="statusbarprogress"
+        width="64"/>
+    </layout_panel>
+  </layout_stack>
+</floater>
diff --git a/indra/newview/skins/default/xui/en/notifications.xml b/indra/newview/skins/default/xui/en/notifications.xml
index 6af49fdecf..e2fc173f7f 100644
--- a/indra/newview/skins/default/xui/en/notifications.xml
+++ b/indra/newview/skins/default/xui/en/notifications.xml
@@ -253,6 +253,16 @@ Save all changes to clothing/body parts?
 
   <notification
    icon="alertmodal.tga"
+   name="FavoritesOnLogin"
+   type="alertmodal">    
+    Note: When you turn on this option, anyone who uses this computer can see your list of favorite locations.
+    <usetemplate
+     name="okbutton"
+     yestext="OK"/>
+  </notification>
+
+  <notification
+   icon="alertmodal.tga"
    name="GrantModifyRights"
    type="alertmodal">
 Granting modify rights to another Resident allows them to change, delete or take ANY objects you may have in-world. Be VERY careful when handing out this permission.
diff --git a/indra/newview/skins/default/xui/en/panel_login.xml b/indra/newview/skins/default/xui/en/panel_login.xml
index 257ed799da..806182bcb4 100644
--- a/indra/newview/skins/default/xui/en/panel_login.xml
+++ b/indra/newview/skins/default/xui/en/panel_login.xml
@@ -61,23 +61,28 @@ left="20"
 width="150">
 Username:
 </text>
-<line_editor
+<combo_box
+allow_text_entry="true"
 follows="left|bottom"
 height="22"
-label="bobsmith12 or Steller Sunshine"
 left_delta="0"
-max_length_bytes="63"
-name="username_edit"
-prevalidate_callback="ascii" 
+max_chars="128"
+prevalidate_callback="ascii"
 select_on_focus="true"
 tool_tip="The username you chose when you registered, like bobsmith12 or Steller Sunshine"
 top_pad="0"
-width="150" />
+name="username_combo"
+width="178">
+  <combo_box.combo_button
+   visible ="false"/>
+  <combo_box.drop_down_button
+   visible ="false"/>
+</combo_box>
 <text
 follows="left|bottom"
 font="SansSerifSmall"
 height="15"
-left_pad="8"
+left_pad="-19"
 name="password_text"
 top="20"
     width="150">
diff --git a/indra/newview/skins/default/xui/en/panel_preferences_privacy.xml b/indra/newview/skins/default/xui/en/panel_preferences_privacy.xml
index 16becbfe2a..ef25588ca3 100644
--- a/indra/newview/skins/default/xui/en/panel_preferences_privacy.xml
+++ b/indra/newview/skins/default/xui/en/panel_preferences_privacy.xml
@@ -78,6 +78,16 @@
      name="auto_disengage_mic_check"
      top_pad="10"
      width="350" />
+    <check_box
+     control_name="ShowFavoritesOnLogin"
+     enabled="false" 
+     height="16"
+     label="Show my Favorite Landmarks at Login (via &apos;Start At&apos; drop-down menu)"
+     layout="topleft"
+     left="30"
+     name="favorites_on_login_check"
+     top_pad="10"
+     width="350" />
 	<text
       type="string"
     length="1"
@@ -87,7 +97,7 @@
      left="30"
      mouse_opaque="false"
      name="Logs:"
-     top_pad="30"
+     top_pad="20"
      width="350">
         Chat Logs:
     </text>
@@ -179,7 +189,7 @@
      layout="topleft"
      left="30"
      name="block_list"
-     top_pad="35"
+     top_pad="28"
      width="145">
         <!--<button.commit_callback
          function="SideTray.ShowPanel"-->