7 files changed, 67 insertions, 76 deletions

diff --git a/linden/indra/newview/app_settings/settings.xml b/linden/indra/newview/app_settings/settings.xml
index ca3dd81..2035b85 100644
--- a/linden/indra/newview/app_settings/settings.xml
+++ b/linden/indra/newview/app_settings/settings.xml
@@ -1849,17 +1849,6 @@
         <integer>0</integer>
       </array>
     </map>
-    <key>CompressSnapshotsToDisk</key>
-    <map>
-      <key>Comment</key>
-      <string>Compress snapshots saved to disk (Using JPEG 2000)</string>
-      <key>Persist</key>
-      <integer>1</integer>
-      <key>Type</key>
-      <string>Boolean</string>
-      <key>Value</key>
-      <integer>0</integer>
-    </map>
     <key>ConnectAsGod</key>
     <map>
       <key>Comment</key>
@@ -4387,7 +4376,7 @@
       <key>Type</key>
       <string>Boolean</string>
       <key>Value</key>
-      <integer>0</integer>
+      <integer>1</integer>
     </map>
     <key>LipSyncOoh</key>
     <map>
diff --git a/linden/indra/newview/llfloatersnapshot.cpp b/linden/indra/newview/llfloatersnapshot.cpp
index 954bf9f..6e66103 100644
--- a/linden/indra/newview/llfloatersnapshot.cpp
+++ b/linden/indra/newview/llfloatersnapshot.cpp
@@ -992,6 +992,7 @@ public:
         static void onClickLess(void* data) ;
         static void onClickMore(void* data) ;
         static void onClickUICheck(LLUICtrl *ctrl, void* data);
+        static void onClickHighResCheck(LLUICtrl *ctrl, void* data);
         static void onClickHUDCheck(LLUICtrl *ctrl, void* data);
         static void onClickKeepOpenCheck(LLUICtrl *ctrl, void* data);
         static void onClickKeepAspectCheck(LLUICtrl *ctrl, void* data);
@@ -1105,6 +1106,10 @@ void LLFloaterSnapshot::Impl::updateLayout(LLFloaterSnapshot* floaterp)
 {
         LLSnapshotLivePreview* previewp = getPreviewView(floaterp);
 
+        LLSnapshotLivePreview::ESnapshotType shot_type = getTypeIndex(floaterp);
+        if (shot_type != LLSnapshotLivePreview::SNAPSHOT_LOCAL)
+                gSavedSettings.setBOOL("HighResSnapshot", FALSE);
+
         S32 delta_height = gSavedSettings.getBOOL("AdvanceSnapshot") ? 0 : floaterp->getUIWinHeightShort() - floaterp->getUIWinHeightLong() ;
 
         LLComboBox* combo;
@@ -1234,6 +1239,7 @@ void LLFloaterSnapshot::Impl::updateControls(LLFloaterSnapshot* floater)
         floater->childSetVisible("snapshot_height",                     is_advance);
         floater->childSetVisible("keep_aspect_check",           is_advance);
         floater->childSetVisible("ui_check",                            is_advance);
+        floater->childSetVisible("high_res_check",                      is_advance && is_local);
         floater->childSetVisible("hud_check",                           is_advance);
         floater->childSetVisible("keep_open_check",                     is_advance);
         floater->childSetVisible("freeze_frame_check",          is_advance);
@@ -1246,7 +1252,7 @@ void LLFloaterSnapshot::Impl::updateControls(LLFloaterSnapshot* floater)
                 layer_type = LLViewerWindow::SNAPSHOT_TYPE_COLOR;
                 floater->childSetValue("layer_types", "colors");
                 if(is_advance)
-                {                       
+                {
                         setResolution(floater, "postcard_size_combo");
                 }
                 break;
@@ -1434,7 +1440,26 @@ void LLFloaterSnapshot::Impl::onClickUICheck(LLUICtrl *ctrl, void* data)
         
         LLFloaterSnapshot *view = (LLFloaterSnapshot *)data;
         if (view)
+        {       
+                BOOL high_res_snapshot = gSavedSettings.getBOOL("HighResSnapshot");
+                if (high_res_snapshot) gSavedSettings.setBOOL("HighResSnapshot", FALSE);
+                view->childSetEnabled("high_res_check", !check->get());
+                checkAutoSnapshot(getPreviewView(view), TRUE);
+        }
+}
+
+// static
+void LLFloaterSnapshot::Impl::onClickHighResCheck(LLUICtrl *ctrl, void* data)
+{
+        LLCheckBoxCtrl *check = (LLCheckBoxCtrl *)ctrl;
+        gSavedSettings.setBOOL( "HighResSnapshot", check->get() );
+        
+        LLFloaterSnapshot *view = (LLFloaterSnapshot *)data;
+        if (view)
         {
+                BOOL ui_in_snapshot = gSavedSettings.getBOOL("RenderUIInSnapshot");
+                if (ui_in_snapshot) gSavedSettings.setBOOL("RenderUIInSnapshot", FALSE);
+                view->childSetEnabled("ui_check", !check->get());
                 checkAutoSnapshot(getPreviewView(view), TRUE);
         }
 }
@@ -1912,6 +1937,9 @@ BOOL LLFloaterSnapshot::postBuild()
 
         childSetCommitCallback("ui_check", Impl::onClickUICheck, this);
 
+        childSetCommitCallback("high_res_check", Impl::onClickHighResCheck, this);
+        childSetValue("high_res_check", gSavedSettings.getBOOL("HighResSnapshot"));
+
         childSetCommitCallback("hud_check", Impl::onClickHUDCheck, this);
         childSetValue("hud_check", gSavedSettings.getBOOL("RenderHUDInSnapshot"));
 
@@ -2001,8 +2029,23 @@ void LLFloaterSnapshot::draw()
                         childSetEnabled("send_btn", FALSE);
                         childSetEnabled("save_btn", FALSE);
                 }
-
+                
                 BOOL ui_in_snapshot = gSavedSettings.getBOOL("RenderUIInSnapshot");
+
+                if (previewp->getSnapshotType() != LLSnapshotLivePreview::SNAPSHOT_LOCAL)
+                {
+                        childSetValue("high_res_check", FALSE);
+                        childSetEnabled("ui_check", TRUE);
+                }
+                else
+                {
+                        if (ui_in_snapshot)
+                        {
+                                gSavedSettings.setBOOL("HighResSnapshot", FALSE);
+                                childSetEnabled("high_res_check", FALSE);
+                        }
+                }
+
                 childSetValue("ui_check", ui_in_snapshot);
                 childSetToolTip("ui_check", std::string("If selected shows the UI in the snapshot"));
         }
diff --git a/linden/indra/newview/llviewermenu.cpp b/linden/indra/newview/llviewermenu.cpp
index 3bf390e..7c653be 100644
--- a/linden/indra/newview/llviewermenu.cpp
+++ b/linden/indra/newview/llviewermenu.cpp
@@ -786,12 +786,6 @@ void init_client_menu(LLMenuGL* menu)
         menu->appendMenu(sub_menu);
 
         menu->appendSeparator();
-
-        menu->append(new LLMenuItemCheckGL( "High-res Snapshot",
-                                                                                &menu_toggle_control,
-                                                                                NULL,
-                                                                                &menu_check_control,
-                                                                                (void*)"HighResSnapshot"));
         
         menu->append(new LLMenuItemCheckGL( "Quiet Snapshots to Disk",
                                                                                 &menu_toggle_control,
@@ -799,12 +793,6 @@ void init_client_menu(LLMenuGL* menu)
                                                                                 &menu_check_control,
                                                                                 (void*)"QuietSnapshotsToDisk"));
 
-        menu->append(new LLMenuItemCheckGL( "Compress Snapshots to Disk",
-                                                                                &menu_toggle_control,
-                                                                                NULL,
-                                                                                &menu_check_control,
-                                                                                (void*)"CompressSnapshotsToDisk"));
-
         menu->append(new LLMenuItemCheckGL("Show Mouselook Crosshairs",
                                                                            &menu_toggle_control,
                                                                            NULL,
@@ -923,12 +911,6 @@ void init_client_menu(LLMenuGL* menu)
                                                                            &menu_check_control,
                                                                            (void*)"LimitSelectDistance"));
 
-        menu->append(new LLMenuItemCheckGL("Disable Camera Constraints", 
-                                                                           &menu_toggle_control,
-                                                                           NULL, 
-                                                                           &menu_check_control,
-                                                                           (void*)"DisableCameraConstraints"));
-
         menu->append(new LLMenuItemCheckGL("Mouse Smoothing",
                                                                                 &menu_toggle_control,
                                                                                 NULL,
@@ -1379,7 +1361,7 @@ void init_debug_avatar_menu(LLMenuGL* menu)
         menu->append(new LLMenuItemToggleGL( "Display Agent Target", &LLAgent::sDebugDisplayTarget));
         menu->append(new LLMenuItemToggleGL( "Debug Rotation", &gDebugAvatarRotation));
         menu->append(new LLMenuItemCallGL("Dump Attachments", handle_dump_attachments));
-        menu->append(new LLMenuItemCallGL("Rebake Textures", handle_rebake_textures, NULL, NULL, 'R', MASK_ALT | MASK_CONTROL ));
+        menu->append(new LLMenuItemCallGL("Refresh Appearance", handle_rebake_textures, NULL, NULL, 'R', MASK_ALT | MASK_CONTROL ));
 #ifndef LL_RELEASE_FOR_DOWNLOAD
         menu->append(new LLMenuItemCallGL("Debug Avatar Textures", handle_debug_avatar_textures, NULL, NULL, 'A', MASK_SHIFT|MASK_CONTROL|MASK_ALT));
         menu->append(new LLMenuItemCallGL("Dump Local Textures", handle_dump_avatar_local_textures, NULL, NULL, 'M', MASK_SHIFT|MASK_ALT ));    
@@ -6259,11 +6241,6 @@ BOOL menu_ui_enabled(void *user_data)
 void menu_toggle_control( void* user_data )
 {
         BOOL checked = gSavedSettings.getBOOL( static_cast<char*>(user_data) );
-        if (std::string(static_cast<char*>(user_data)) == "HighResSnapshot" && !checked)
-        {
-                // High Res Snapshot active, must uncheck RenderUIInSnapshot
-                gSavedSettings.setBOOL( "RenderUIInSnapshot", FALSE );
-        }
         gSavedSettings.setBOOL( static_cast<char*>(user_data), !checked );
 }
 
@@ -6275,11 +6252,6 @@ class LLToggleControl : public view_listener_t
         {
                 std::string control_name = userdata.asString();
                 BOOL checked = gSavedSettings.getBOOL( control_name );
-                if (control_name == "HighResSnapshot" && !checked)
-                {
-                        // High Res Snapshot active, must uncheck RenderUIInSnapshot
-                        gSavedSettings.setBOOL( "RenderUIInSnapshot", FALSE );
-                }
                 gSavedSettings.setBOOL( control_name, !checked );
                 return true;
         }
@@ -9788,6 +9760,7 @@ void initialize_menus()
         addMenu(new LLEditEnableDuplicate(), "Edit.EnableDuplicate");
         addMenu(new LLEditEnableTakeOff(), "Edit.EnableTakeOff");
         addMenu(new LLEditEnableCustomizeAvatar(), "Edit.EnableCustomizeAvatar");
+        addMenu(new LLAdvancedRebakeTextures(), "Advanced.RebakeTextures");
 
         // View menu
         addMenu(new LLViewMouselook(), "View.Mouselook");
@@ -10096,7 +10069,6 @@ void initialize_menus()
         addMenu(new LLAdvancedToggleDebugAvatarRotation(), "Advanced.ToggleDebugAvatarRotation");
         addMenu(new LLAdvancedCheckDebugAvatarRotation(), "Advanced.CheckDebugAvatarRotation");
         addMenu(new LLAdvancedDumpAttachments(), "Advanced.DumpAttachments");
-        addMenu(new LLAdvancedRebakeTextures(), "Advanced.RebakeTextures");
         addMenu(new LLAdvancedDebugAvatarTextures(), "Advanced.DebugAvatarTextures");
         addMenu(new LLAdvancedDumpAvatarLocalTextures(), "Advanced.DumpAvatarLocalTextures");
 
diff --git a/linden/indra/newview/llviewerwindow.cpp b/linden/indra/newview/llviewerwindow.cpp
index 2e77316..854d757 100644
--- a/linden/indra/newview/llviewerwindow.cpp
+++ b/linden/indra/newview/llviewerwindow.cpp
@@ -3812,10 +3812,6 @@ BOOL LLViewerWindow::saveImageNumbered(LLImageFormatted *image)
         }
 
         std::string extension("." + image->getExtension());
-        if (extension.empty())
-        {
-                extension = (gSavedSettings.getBOOL("CompressSnapshotsToDisk")) ? ".j2c" : ".bmp";
-        }
 
         LLFilePicker::ESaveFilter pick_type;
         if (extension == ".j2c")
diff --git a/linden/indra/newview/skins/default/xui/en-us/floater_snapshot.xml b/linden/indra/newview/skins/default/xui/en-us/floater_snapshot.xml
index 0c60090..c2eb3c2 100644
--- a/linden/indra/newview/skins/default/xui/en-us/floater_snapshot.xml
+++ b/linden/indra/newview/skins/default/xui/en-us/floater_snapshot.xml
@@ -139,6 +139,8 @@
         <slider bottom_delta="-20" decimal_digits="0" follows="left|top" height="15"
              increment="1" initial_val="75" label="Image Quality" left="10"
              max_val="100" min_val="0" name="image_quality_slider" width="210" />
+        <check_box bottom_delta="0" follows="left|top" label="High resolution snapshot"
+             left="10" name="high_res_check" />
         <text bottom_delta="-28" follows="left|top" height="20" left="10"
              name="layer_type_label" width="50">
                 Capture:
diff --git a/linden/indra/newview/skins/default/xui/en-us/menu_viewer.xml b/linden/indra/newview/skins/default/xui/en-us/menu_viewer.xml
index 682acb9..5f9d50c 100644
--- a/linden/indra/newview/skins/default/xui/en-us/menu_viewer.xml
+++ b/linden/indra/newview/skins/default/xui/en-us/menu_viewer.xml
@@ -205,6 +205,12 @@
                   userdata="all" />
       </menu_item_call>
     </menu>
+      <menu_item_call name="Refresh Appearance"
+                      label="Refresh Appearance"
+                      shortcut="control|alt|R">
+        <on_click function="Advanced.RebakeTextures"
+                  userdata="" />
+      </menu_item_call>
     <menu_item_separator />
     <menu_item_call name="Gestures..." label="Gestures..."
                     shortcut="control|G">
@@ -932,24 +938,13 @@
 
     <menu_item_separator />
 
-    <menu_item_check name="High-res Snapshot"
-                     label="High-res Snapshot">
-      <on_click function="ToggleControl"
-                userdata="HighResSnapshot" />
-      <on_check control="HighResSnapshot" />
-    </menu_item_check>
+
     <menu_item_check name="Quiet Snapshots to Disk"
                      label="Quiet Snapshots to Disk">
       <on_click function="ToggleControl"
                 userdata="QuietSnapshotsToDisk" />
       <on_check control="QuietSnapshotsToDisk" />
     </menu_item_check>
-    <menu_item_check name="Compress Snapshots to Disk"
-                     label="Compress Snapshots to Disk">
-      <on_click function="ToggleControl"
-                userdata="CompressSnapshotsToDisk" />
-      <on_check control="CompressSnapshotsToDisk" />
-    </menu_item_check>
     <menu_item_check name="Show Mouselook Crosshairs"
                      label="Show Mouselook Crosshairs">
       <on_click function="ToggleControl"
@@ -1619,7 +1614,8 @@
                   userdata="" />
       </menu_item_call>
       <menu_item_check name="Show XUI Names"
-                       label="Show XUI Names">
+                       label="Show XUI Names"
+                       shortcut="control|shift|x">
         <on_click function="Advanced.ToggleXUINames"
                   userdata="" />
         <on_check function="Advanced.CheckXUINames"
@@ -1835,12 +1831,6 @@
         <on_click function="Advanced.DumpAttachments"
                   userdata="" />
       </menu_item_call>
-      <menu_item_call name="Rebake Textures"
-                      label="Rebake Textures"
-                      shortcut="control|alt|R">
-        <on_click function="Advanced.RebakeTextures"
-                  userdata="" />
-      </menu_item_call>
     </menu>
 
 
@@ -1963,12 +1953,6 @@
                 userdata="LimitSelectDistance" />
       <on_check control="LimitSelectDistance" />
     </menu_item_check>
-    <menu_item_check name="Disable Camera Constraints"
-                     label="Disable Camera Constraints">
-      <on_click function="ToggleControl"
-                userdata="DisableCameraConstraints" />
-      <on_check control="DisableCameraConstraints" />
-    </menu_item_check>
     <menu_item_check name="Mouse Smoothing"
                      label="Mouse Smoothing">
       <on_click function="ToggleControl"
diff --git a/linden/indra/newview/skins/default/xui/en-us/panel_preferences_input.xml b/linden/indra/newview/skins/default/xui/en-us/panel_preferences_input.xml
index 23e357f..1867323 100644
--- a/linden/indra/newview/skins/default/xui/en-us/panel_preferences_input.xml
+++ b/linden/indra/newview/skins/default/xui/en-us/panel_preferences_input.xml
@@ -79,18 +79,23 @@
              label="Automatic Appearance Camera Movement" left="148" mouse_opaque="true"
              name="appearance camera movement" radio_style="false"
              tool_tip="Use automatic camera positioning while in edit mode" width="242" />
+        <check_box bottom_delta="-18" control_name="DisableCameraConstraints" enabled="true"
+             follows="left|top" font="SansSerifSmall" height="16" initial_value="false"
+             label="Disable camera constraints" left="148" mouse_opaque="true"
+             name="Disable camera constraints" radio_style="false"
+             tool_tip="Disables camera limits such as distance and terrain" width="242" />
         <text type="string" length="1" bg_visible="false" border_drop_shadow_visible="false" border_visible="false"
-             bottom="-228" drop_shadow_visible="true" enabled="true" follows="left|top"
+             bottom_delta="-32" drop_shadow_visible="true" enabled="true" follows="left|top"
              font="SansSerifSmall" h_pad="0" halign="left" height="12" left="10"
              mouse_opaque="true" name="text2" v_pad="0" width="128">
                 Avatar Display Options:
         </text>
-        <check_box bottom="-232" control_name="FirstPersonAvatarVisible" enabled="true"
+        <check_box bottom_delta="-4" control_name="FirstPersonAvatarVisible" enabled="true"
              follows="left|top" font="SansSerifSmall" height="16" initial_value="false"
              label="Show Avatar in Mouselook" left="148" mouse_opaque="true" name="avfp"
              radio_style="false" width="256" />
         <text type="string" length="1" bg_visible="false" border_drop_shadow_visible="false" border_visible="false"
-             bottom="-264" drop_shadow_visible="true" enabled="true" follows="left|top"
+             bottom_delta="-32" drop_shadow_visible="true" enabled="true" follows="left|top"
              font="SansSerifSmall" h_pad="0" halign="left" height="12" left="10"
              mouse_opaque="true" name="text5" v_pad="0" width="128">
                 Joystick Options: