Fix Issue 459: Appearance, Create Outfit does not keep edits to outfit - HAPPENS EVERY TIME

Automatically detach copyable attachments early, so that changes will be kept (LLMakeOutfitDialog was changed to update the outfit correctly, despite items being removed. It should probably be cleaned up further)
Adds an extra checkbox to make outfit dialog to disable this new auto-detach behavior, for users who rely on the old behavior.

Also fixes a bug I noticed in LLMakeOutfitDialog in which the use links checkbox would be enabled even if the grid doesn't support links
Had to reposition everything to get the new checkbox to sit nicely, but in doing so changed bottoms to bottom_deltas so it should be easier in the future, layout remains the same, of course, shouldn't be noticed.

indra/newview/app_settings/settings.xml

@@ -684,6 +684,17 @@
       <key>Value</key>
       <integer>0</integer>
     </map>
+    <key>LiruLegacyOutfitStoreObjChanges</key>
+    <map>
+      <key>Comment</key>
+      <string>While true, automatic detach is performed upon all copyable attachments just before legacy outfit creation to preserve any modifications to them.  As a last resort, setting this false allows creating a legacy outfit that won't save changes made to copyable attachments since wearing them or login.</string>
+      <key>Persist</key>
+      <integer>1</integer>
+      <key>Type</key>
+      <string>Boolean</string>
+      <key>Value</key>
+      <integer>1</integer>
+    </map>
     <key>LiruNoTransactionClutter</key>
     <map>
       <key>Comment</key>

indra/newview/llappearancemgr.cpp

@@ -3664,6 +3664,7 @@ public:
 		if (!LLApp::isRunning() || mFailed)
 			return;
 
+		/* Singu Note: This wasn't working when we detached copyable attachments early, changeOutfit instead
 		LLInventoryModel::item_array_t body_items, wear_items, obj_items, gest_items;
 		for(std::set<LLUUID>::const_iterator it = mWearItems.begin(); it != mWearItems.end(); ++it)
 		{
@@ -3692,6 +3693,8 @@ public:
 		
 		if(!body_items.empty() || !wear_items.empty() || !obj_items.empty() || !gest_items.empty())
 			LLAppearanceMgr::instance().updateCOF(body_items, wear_items, obj_items, gest_items, false);
+		*/
+		LLAppearanceMgr::instance().changeOutfit(true, mFolderID, false);
 	}
 private:
 	class LLCreateBase : public LLInventoryCallback
@@ -3880,6 +3883,7 @@ LLUUID LLAppearanceMgr::makeNewOutfitLegacy(const std::string& new_folder_name,
 	LLInventoryModel::item_array_t remove_items;
 
 	LLPointer<LLCreateLegacyOutfit> cb = new LLCreateLegacyOutfit(folder_id,boost::bind(&scroll_to_folder,folder_id),boost::bind(&show_created_outfit,folder_id,true));
+	uuid_vec_t obj_ids; // Collect the uuids of copyable objects, in order to keep any changes made in the copies
 
 	for (LLInventoryModel::item_array_t::const_iterator iter = items.begin();
 		 iter != items.end();
@@ -3888,8 +3892,9 @@ LLUUID LLAppearanceMgr::makeNewOutfitLegacy(const std::string& new_folder_name,
 		LLViewerInventoryItem* item = (*iter);
 		LLViewerInventoryItem* base_item = item->getLinkedItem() ? item->getLinkedItem() : item;
 		bool is_copy = base_item->getPermissions().allowCopyBy(gAgent.getID());
+		bool is_obj = base_item->getInventoryType() == LLInventoryType::IT_OBJECT;
 		//Just treat 'object' type as modifiable... permission slam screws them up pretty well.
-		bool is_mod = base_item->getInventoryType() == LLInventoryType::IT_OBJECT || base_item->getPermissions().allowModifyBy(gAgent.getID());
+		bool is_mod = is_obj || base_item->getPermissions().allowModifyBy(gAgent.getID());
 		//If it's multi-worn we want to create a copy of the item if possible AND create a new link to that new copy with the same desc as the old link.
 		bool is_multi = base_item->isWearableType() && gAgentWearables.getWearableCount(base_item->getWearableType()) > 1 ;
 
@@ -3899,9 +3904,12 @@ LLUUID LLAppearanceMgr::makeNewOutfitLegacy(const std::string& new_folder_name,
 		}
 		else if( is_copy )
 		{
+			if (is_obj) obj_ids.push_back(base_item->getUUID()); // If it's a copyable object, store it for later
 			cb->makeCopy(item,is_multi && use_links);
 		}
 	}
+	if (gSavedSettings.getBOOL("LiruLegacyOutfitStoreObjChanges")) // As a last resort, someone may create a legacy outfit to undo attachment changes
+		LLAppearanceMgr::instance().removeItemsFromAvatar(obj_ids); // The avatar will have to go without these for now
 	cb->dispatch();
 
 	return folder_id;

indra/newview/llmakeoutfitdialog.cpp

@@ -86,7 +86,6 @@ LLMakeOutfitDialog::LLMakeOutfitDialog(bool modal) : LLModalDialog(LLStringUtil:
 
 	if (!gHippoGridManager->getConnectedGrid()->supportsInvLinks())
 	{
-		childSetEnabled("checkbox_use_links", false);
 		childSetValue("checkbox_use_links", false);
 		childSetEnabled("checkbox_use_outfits", false);
 		childSetValue("checkbox_use_outfits", false);
@@ -140,7 +139,8 @@ void LLMakeOutfitDialog::refresh()
 		if (fUseOutfits)
 			pCheckCtrl->setValue(true);
 	}
-	childSetEnabled("checkbox_use_links", !fUseOutfits);
+	getChild<LLUICtrl>("checkbox_use_links")->setEnabled(!fUseOutfits && gHippoGridManager->getConnectedGrid()->supportsInvLinks());
+	getChild<LLUICtrl>("checkbox_legacy_copy_changes")->setEnabled(!fUseOutfits);
 }
 
 

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

@@ -9,20 +9,20 @@
   <button bottom="5" enabled="true" font="SansSerif" halign="center" height="20"
 	     label="Cancel" label_selected="Cancel" left="261" mouse_opaque="true"
 	     name="Cancel" scale_image="true" width="82" />
-  <check_box bottom="-216" enabled="true" follows="left|top" font="SansSerifSmall"
+  <check_box bottom="-196" enabled="true" follows="left|top" font="SansSerifSmall"
 	     height="16" initial_value="false" label="Shape" left="13"
 	     mouse_opaque="true" name="checkbox_shape" radio_style="false" width="100" />
-  <check_box bottom="-236" enabled="true" follows="left|top" font="SansSerifSmall"
+  <check_box bottom_delta="-20" enabled="true" follows="left|top" font="SansSerifSmall"
 	     height="16" initial_value="false" label="Skin" left="13"
 	     mouse_opaque="true" name="checkbox_skin" radio_style="false" width="100" />
-  <check_box bottom="-256" enabled="true" follows="left|top" font="SansSerifSmall"
+  <check_box bottom_delta="-20" enabled="true" follows="left|top" font="SansSerifSmall"
 	     height="16" initial_value="false" label="Hair" left="13"
 	     mouse_opaque="true" name="checkbox_hair" radio_style="false" width="100" />
-  <check_box bottom="-276" enabled="true" follows="left|top" font="SansSerifSmall"
+  <check_box bottom_delta="-20" enabled="true" follows="left|top" font="SansSerifSmall"
 	     height="16" initial_value="false" label="Eyes" left="13"
 	     mouse_opaque="true" name="checkbox_eyes" radio_style="false" width="100" />
   <text type="string" length="1" bg_visible="false" border_drop_shadow_visible="false" border_visible="false"
-		 bottom="75" drop_shadow_visible="true" enabled="true" follows="left|top"
+		 bottom="95" drop_shadow_visible="true" enabled="true" follows="left|top"
 		 font="SansSerifSmall" h_pad="0" halign="left" height="14" left="13"
 		 mouse_opaque="true" name="Options:" v_pad="0" width="100">
     Options:
@@ -38,190 +38,191 @@
 		 enabled="true" label="Use links for non-copy, no-mod, or multi-worn items" font="SansSerifSmall"
 	     bottom_delta="-20" left_delta="0" follows="left|top" height="16" width="300"
 	     mouse_opaque="true" radio_style="false" />
-  <check_box bottom="-216" enabled="true" follows="left|top" font="SansSerifSmall"
+  <check_box bottom_delta="-20" follows="left|top" control_name="LiruLegacyOutfitStoreObjChanges" name="checkbox_legacy_copy_changes" label="Copy changes made to attachments" tool_tip="Keeps changes made to attachments, since they were worn or you last logged in, by detaching them just before creating the outfit.  Generally, this should be checked, if you know what you're doing, such as making a new outfit to undo bad changes, you'll need to uncheck it."/>
+  <check_box bottom="-196" enabled="true" follows="left|top" font="SansSerifSmall"
 	     height="16" initial_value="false" label="Shirt" left="113"
 	     mouse_opaque="true" name="checkbox_shirt" radio_style="false" width="100" />
-  <check_box bottom="-236" enabled="true" follows="left|top" font="SansSerifSmall"
+  <check_box bottom_delta="-20" enabled="true" follows="left|top" font="SansSerifSmall"
 	     height="16" initial_value="false" label="Pants" left="113"
 	     mouse_opaque="true" name="checkbox_pants" radio_style="false" width="100" />
-  <check_box bottom="-256" enabled="true" follows="left|top" font="SansSerifSmall"
+  <check_box bottom_delta="-20" enabled="true" follows="left|top" font="SansSerifSmall"
 	     height="16" initial_value="false" label="Shoes" left="113"
 	     mouse_opaque="true" name="checkbox_shoes" radio_style="false" width="100" />
-  <check_box bottom="-276" enabled="true" follows="left|top" font="SansSerifSmall"
+  <check_box bottom_delta="-20" enabled="true" follows="left|top" font="SansSerifSmall"
 	     height="16" initial_value="false" label="Socks" left="113"
 	     mouse_opaque="true" name="checkbox_socks" radio_style="false" width="100" />
-  <check_box bottom="-296" enabled="true" follows="left|top" font="SansSerifSmall"
+  <check_box bottom_delta="-20" enabled="true" follows="left|top" font="SansSerifSmall"
 	     height="16" initial_value="false" label="Jacket" left="113"
 	     mouse_opaque="true" name="checkbox_jacket" radio_style="false" width="100" />
-  <check_box bottom="-316" enabled="true" follows="left|top" font="SansSerifSmall"
+  <check_box bottom_delta="-20" enabled="true" follows="left|top" font="SansSerifSmall"
 	     height="16" initial_value="false" label="Gloves" left="113"
 	     mouse_opaque="true" name="checkbox_gloves" radio_style="false" width="100" />
-  <check_box bottom="-336" enabled="true" follows="left|top" font="SansSerifSmall"
+  <check_box bottom_delta="-20" enabled="true" follows="left|top" font="SansSerifSmall"
 	     height="16" initial_value="false" label="Undershirt" left="113"
 	     mouse_opaque="true" name="checkbox_undershirt" radio_style="false"
 	     width="100" />
-  <check_box bottom="-356" enabled="true" follows="left|top" font="SansSerifSmall"
+  <check_box bottom_delta="-20" enabled="true" follows="left|top" font="SansSerifSmall"
 	     height="16" initial_value="false" label="Underpants" left="113"
 	     mouse_opaque="true" name="checkbox_underpants" radio_style="false"
 	     width="100" />
-  <check_box bottom="-376" enabled="true" follows="left|top" font="SansSerifSmall"
+  <check_box bottom_delta="-20" enabled="true" follows="left|top" font="SansSerifSmall"
 	     height="16" initial_value="false" label="Skirt" left="113"
 	     mouse_opaque="true" name="checkbox_skirt" radio_style="false" width="100" />
-  <check_box bottom="-396" enabled="true" follows="left|top" font="SansSerifSmall"
+  <check_box bottom_delta="-20" enabled="true" follows="left|top" font="SansSerifSmall"
 	     height="16" initial_value="false" label="Tattoo" left="113"
 	     mouse_opaque="true" name="checkbox_tattoo" radio_style="false" width="100" />
-  <check_box bottom="-416" enabled="true" follows="left|top" font="SansSerifSmall"
+  <check_box bottom_delta="-20" enabled="true" follows="left|top" font="SansSerifSmall"
 	     height="16" initial_value="false" label="Alpha" left="113"
 	     mouse_opaque="true" name="checkbox_alpha" radio_style="false" width="100" />
-  <check_box bottom="-436" enabled="true" follows="left|top" font="SansSerifSmall"
+  <check_box bottom_delta="-20" enabled="true" follows="left|top" font="SansSerifSmall"
 		 height="16" initial_value="false" label="Physics" left="113"
 		 mouse_opaque="true" name="checkbox_physics" radio_style="false" width="100" />
-  <check_box bottom="-216" enabled="false" follows="left|top" font="SansSerifSmall"
+  <check_box bottom="-196" enabled="false" follows="left|top" font="SansSerifSmall"
 	     height="16" initial_value="false" label="Chest" left="213"
 	     mouse_opaque="true" name="checkbox_Chest" radio_style="false" width="100" />
-  <check_box bottom="-236" enabled="true" follows="left|top" font="SansSerifSmall"
+  <check_box bottom_delta="-20" enabled="true" follows="left|top" font="SansSerifSmall"
 	     height="16" initial_value="true" label="Skull" left="213"
 	     mouse_opaque="true" name="checkbox_Skull" radio_style="false" width="100" />
-  <check_box bottom="-256" enabled="false" follows="left|top" font="SansSerifSmall"
+  <check_box bottom_delta="-20" enabled="false" follows="left|top" font="SansSerifSmall"
 	     height="16" initial_value="false" label="Left Shoulder" left="213"
 	     mouse_opaque="true" name="checkbox_Left Shoulder" radio_style="false"
 	     width="100" />
-  <check_box bottom="-276" enabled="false" follows="left|top" font="SansSerifSmall"
+  <check_box bottom_delta="-20" enabled="false" follows="left|top" font="SansSerifSmall"
 	     height="16" initial_value="false" label="Right Shoulder" left="213"
 	     mouse_opaque="true" name="checkbox_Right Shoulder" radio_style="false"
 	     width="106" />
-  <check_box bottom="-296" enabled="false" follows="left|top" font="SansSerifSmall"
+  <check_box bottom_delta="-20" enabled="false" follows="left|top" font="SansSerifSmall"
 	     height="16" initial_value="false" label="Left Hand" left="213"
 	     mouse_opaque="true" name="checkbox_Left Hand" radio_style="false"
 	     width="100" />
-  <check_box bottom="-316" enabled="false" follows="left|top" font="SansSerifSmall"
+  <check_box bottom_delta="-20" enabled="false" follows="left|top" font="SansSerifSmall"
 	     height="16" initial_value="false" label="Right Hand" left="213"
 	     mouse_opaque="true" name="checkbox_Right Hand" radio_style="false"
 	     width="100" />
-  <check_box bottom="-336" enabled="true" follows="left|top" font="SansSerifSmall"
+  <check_box bottom_delta="-20" enabled="true" follows="left|top" font="SansSerifSmall"
 	     height="16" initial_value="true" label="Left Foot" left="213"
 	     mouse_opaque="true" name="checkbox_Left Foot" radio_style="false"
 	     width="100" />
-  <check_box bottom="-356" enabled="true" follows="left|top" font="SansSerifSmall"
+  <check_box bottom_delta="-20" enabled="true" follows="left|top" font="SansSerifSmall"
 	     height="16" initial_value="true" label="Right Foot" left="213"
 	     mouse_opaque="true" name="checkbox_Right Foot" radio_style="false"
 	     width="100" />
-  <check_box bottom="-376" enabled="false" follows="left|top" font="SansSerifSmall"
+  <check_box bottom_delta="-20" enabled="false" follows="left|top" font="SansSerifSmall"
 	     height="16" initial_value="false" label="Spine" left="213"
 	     mouse_opaque="true" name="checkbox_Spine" radio_style="false" width="100" />
-  <check_box bottom="-396" enabled="false" follows="left|top" font="SansSerifSmall"
+  <check_box bottom_delta="-20" enabled="false" follows="left|top" font="SansSerifSmall"
 	     height="16" initial_value="false" label="Pelvis" left="213"
 	     mouse_opaque="true" name="checkbox_Pelvis" radio_style="false" width="100" />
-  <check_box bottom="-416" enabled="false" follows="left|top" font="SansSerifSmall"
+  <check_box bottom_delta="-20" enabled="false" follows="left|top" font="SansSerifSmall"
 	     height="16" initial_value="false" label="Mouth" left="213"
 	     mouse_opaque="true" name="checkbox_Mouth" radio_style="false" width="100" />
-  <check_box bottom="-436" enabled="false" follows="left|top" font="SansSerifSmall"
+  <check_box bottom_delta="-20" enabled="false" follows="left|top" font="SansSerifSmall"
 	     height="16" initial_value="false" label="Chin" left="213"
 	     mouse_opaque="true" name="checkbox_Chin" radio_style="false" width="100" />
-  <check_box bottom="-456" enabled="false" follows="left|top" font="SansSerifSmall"
+  <check_box bottom_delta="-20" enabled="false" follows="left|top" font="SansSerifSmall"
 	     height="16" initial_value="false" label="Left Ear" left="213"
 	     mouse_opaque="true" name="checkbox_Left Ear" radio_style="false"
 	     width="100" />
-  <check_box bottom="-216" enabled="false" follows="left|top" font="SansSerifSmall"
+  <check_box bottom="-196" enabled="false" follows="left|top" font="SansSerifSmall"
 	     height="16" initial_value="false" label="Right Ear" left="313"
 	     mouse_opaque="true" name="checkbox_Right Ear" radio_style="false"
 	     width="100" />
-  <check_box bottom="-236" enabled="false" follows="left|top" font="SansSerifSmall"
+  <check_box bottom_delta="-20" enabled="false" follows="left|top" font="SansSerifSmall"
 	     height="16" initial_value="false" label="Left Eyeball" left="313"
 	     mouse_opaque="true" name="checkbox_Left Eyeball" radio_style="false"
 	     width="100" />
-  <check_box bottom="-256" enabled="false" follows="left|top" font="SansSerifSmall"
+  <check_box bottom_delta="-20" enabled="false" follows="left|top" font="SansSerifSmall"
 	     height="16" initial_value="false" label="Right Eyeball" left="313"
 	     mouse_opaque="true" name="checkbox_Right Eyeball" radio_style="false"
 	     width="100" />
-  <check_box bottom="-276" enabled="false" follows="left|top" font="SansSerifSmall"
+  <check_box bottom_delta="-20" enabled="false" follows="left|top" font="SansSerifSmall"
 	     height="16" initial_value="false" label="Nose" left="313"
 	     mouse_opaque="true" name="checkbox_Nose" radio_style="false" width="100" />
-  <check_box bottom="-296" enabled="false" follows="left|top" font="SansSerifSmall"
+  <check_box bottom_delta="-20" enabled="false" follows="left|top" font="SansSerifSmall"
 	     height="16" initial_value="false" label="R Upper Arm" left="313"
 	     mouse_opaque="true" name="checkbox_R Upper Arm" radio_style="false"
 	     width="100" />
-  <check_box bottom="-316" enabled="false" follows="left|top" font="SansSerifSmall"
+  <check_box bottom_delta="-20" enabled="false" follows="left|top" font="SansSerifSmall"
 	     height="16" initial_value="false" label="R Forearm" left="313"
 	     mouse_opaque="true" name="checkbox_R Forearm" radio_style="false"
 	     width="100" />
-  <check_box bottom="-336" enabled="false" follows="left|top" font="SansSerifSmall"
+  <check_box bottom_delta="-20" enabled="false" follows="left|top" font="SansSerifSmall"
 	     height="16" initial_value="false" label="L Upper Arm" left="313"
 	     mouse_opaque="true" name="checkbox_L Upper Arm" radio_style="false"
 	     width="100" />
-  <check_box bottom="-356" enabled="false" follows="left|top" font="SansSerifSmall"
+  <check_box bottom_delta="-20" enabled="false" follows="left|top" font="SansSerifSmall"
 	     height="16" initial_value="false" label="L Forearm" left="313"
 	     mouse_opaque="true" name="checkbox_L Forearm" radio_style="false"
 	     width="100" />
-  <check_box bottom="-376" enabled="false" follows="left|top" font="SansSerifSmall"
+  <check_box bottom_delta="-20" enabled="false" follows="left|top" font="SansSerifSmall"
 	     height="16" initial_value="false" label="Right Hip" left="313"
 	     mouse_opaque="true" name="checkbox_Right Hip" radio_style="false"
 	     width="100" />
-  <check_box bottom="-396" enabled="false" follows="left|top" font="SansSerifSmall"
+  <check_box bottom_delta="-20" enabled="false" follows="left|top" font="SansSerifSmall"
 	     height="16" initial_value="false" label="R Upper Leg" left="313"
 	     mouse_opaque="true" name="checkbox_R Upper Leg" radio_style="false"
 	     width="100" />
-  <check_box bottom="-416" enabled="true" follows="left|top" font="SansSerifSmall"
+  <check_box bottom_delta="-20" enabled="true" follows="left|top" font="SansSerifSmall"
 	     height="16" initial_value="true" label="R Lower Leg" left="313"
 	     mouse_opaque="true" name="checkbox_R Lower Leg" radio_style="false"
 	     width="100" />
-  <check_box bottom="-436" enabled="false" follows="left|top" font="SansSerifSmall"
+  <check_box bottom_delta="-20" enabled="false" follows="left|top" font="SansSerifSmall"
 	     height="16" initial_value="false" label="Left Hip" left="313"
 	     mouse_opaque="true" name="checkbox_Left Hip" radio_style="false"
 	     width="100" />
-  <check_box bottom="-456" enabled="false" follows="left|top" font="SansSerifSmall"
+  <check_box bottom_delta="-20" enabled="false" follows="left|top" font="SansSerifSmall"
 	     height="16" initial_value="false" label="L Upper Leg" left="313"
 	     mouse_opaque="true" name="checkbox_L Upper Leg" radio_style="false"
 	     width="100" />
-  <check_box bottom="-216" enabled="true" follows="left|top" font="SansSerifSmall"
+  <check_box bottom="-196" enabled="true" follows="left|top" font="SansSerifSmall"
 	     height="16" initial_value="true" label="L Lower Leg" left="413"
 	     mouse_opaque="true" name="checkbox_L Lower Leg" radio_style="false"
 	     width="100" />
-  <check_box bottom="-236" enabled="false" follows="left|top" font="SansSerifSmall"
+  <check_box bottom_delta="-20" enabled="false" follows="left|top" font="SansSerifSmall"
 	     height="16" initial_value="false" label="Stomach" left="413"
 	     mouse_opaque="true" name="checkbox_Stomach" radio_style="false" width="100" />
-  <check_box bottom="-256" enabled="false" follows="left|top" font="SansSerifSmall"
+  <check_box bottom_delta="-20" enabled="false" follows="left|top" font="SansSerifSmall"
 	     height="16" initial_value="false" label="Left Pec" left="413"
 	     mouse_opaque="true" name="checkbox_Left Pec" radio_style="false"
 	     width="100" />
-  <check_box bottom="-276" enabled="false" follows="left|top" font="SansSerifSmall"
+  <check_box bottom_delta="-20" enabled="false" follows="left|top" font="SansSerifSmall"
 	     height="16" initial_value="false" label="Right Pec" left="413"
 	     mouse_opaque="true" name="checkbox_Right Pec" radio_style="false"
 	     width="100" />
-  <check_box bottom="-296" enabled="false" follows="left|top" font="SansSerifSmall"
+  <check_box bottom_delta="-20" enabled="false" follows="left|top" font="SansSerifSmall"
 	     height="16" initial_value="false" label="Neck" left="413"
 	     mouse_opaque="true" name="checkbox_Neck" radio_style="false"
 	     width="100" />
-  <check_box bottom="-316" enabled="false" follows="left|top" font="SansSerifSmall"
+  <check_box bottom_delta="-20" enabled="false" follows="left|top" font="SansSerifSmall"
 	     height="16" initial_value="false" label="Root" left="413"
 	     mouse_opaque="true" name="checkbox_Root" radio_style="false"
 	     width="100" />
-  <check_box bottom="-336" enabled="false" follows="left|top" font="SansSerifSmall"
+  <check_box bottom_delta="-20" enabled="false" follows="left|top" font="SansSerifSmall"
 	     height="16" initial_value="false" label="Center 2" left="413"
 	     mouse_opaque="true" name="checkbox_Center 2" radio_style="false"
 	     width="100" />
-  <check_box bottom="-356" enabled="false" follows="left|top" font="SansSerifSmall"
+  <check_box bottom_delta="-20" enabled="false" follows="left|top" font="SansSerifSmall"
 	     height="16" initial_value="false" label="Top Right" left="413"
 	     mouse_opaque="true" name="checkbox_Top Right" radio_style="false"
 	     width="100" />
-  <check_box bottom="-376" enabled="false" follows="left|top" font="SansSerifSmall"
+  <check_box bottom_delta="-20" enabled="false" follows="left|top" font="SansSerifSmall"
 	     height="16" initial_value="false" label="Top" left="413"
 	     mouse_opaque="true" name="checkbox_Top" radio_style="false" width="100" />
-  <check_box bottom="-396" enabled="false" follows="left|top" font="SansSerifSmall"
+  <check_box bottom_delta="-20" enabled="false" follows="left|top" font="SansSerifSmall"
 	     height="16" initial_value="false" label="Top Left" left="413"
 	     mouse_opaque="true" name="checkbox_Top Left" radio_style="false"
 	     width="100" />
-  <check_box bottom="-416" enabled="false" follows="left|top" font="SansSerifSmall"
+  <check_box bottom_delta="-20" enabled="false" follows="left|top" font="SansSerifSmall"
 	     height="16" initial_value="false" label="Center" left="413"
 	     mouse_opaque="true" name="checkbox_Center" radio_style="false" width="100" />
-  <check_box bottom="-436" enabled="false" follows="left|top" font="SansSerifSmall"
+  <check_box bottom_delta="-20" enabled="false" follows="left|top" font="SansSerifSmall"
 	     height="16" initial_value="false" label="Bottom Left" left="413"
 	     mouse_opaque="true" name="checkbox_Bottom Left" radio_style="false"
 	     width="100" />
-  <check_box bottom="-456" enabled="false" follows="left|top" font="SansSerifSmall"
+  <check_box bottom_delta="-20" enabled="false" follows="left|top" font="SansSerifSmall"
 	     height="16" initial_value="false" label="Bottom" left="413"
 	     mouse_opaque="true" name="checkbox_Bottom" radio_style="false" width="100" />
-  <check_box bottom="-476" enabled="false" follows="left|top" font="SansSerifSmall"
+  <check_box bottom_delta="-20" enabled="false" follows="left|top" font="SansSerifSmall"
 	     height="16" initial_value="false" label="Bottom Right" left="413"
 	     mouse_opaque="true" name="checkbox_Bottom Right" radio_style="false"
 	     width="100" />
@@ -237,20 +238,19 @@
 	     mouse_opaque="true"
 	     name="Outfits are folders that contain clothing and body parts. Drag an outfit folder onto your avatar to put it on.   &quot;Make New Outfit&quot; makes a new folder and saves copies of the items you are now wearing into it."
 	     v_pad="0" width="489">
-    Outfits are folders that contain clothing and body parts.
-    Drag an outfit folder onto your avatar to put it on.
+Outfits are folders that contain clothing and body parts.
+Drag an outfit folder onto your avatar to put it on.
 
-    &quot;Make New Outfit&quot; makes a new folder and saves copies of the items you are
-    now wearing into it.
+&quot;Make New Outfit&quot; makes a new folder and saves copies of the items you are now wearing into it.
   </text>
   <text type="string" length="1" bg_visible="false" border_drop_shadow_visible="false" border_visible="false"
-	     bottom="-126" drop_shadow_visible="true" enabled="true" follows="left|top"
+	     bottom="-106" drop_shadow_visible="true" enabled="true" follows="left|top"
 	     font="SansSerif" h_pad="0" halign="left" height="16" left="13"
 	     mouse_opaque="true" name="Folder name:" v_pad="0" width="489">
     Folder name:
   </text>
   <text type="string" length="1" bg_visible="false" border_drop_shadow_visible="false" border_visible="false"
-	     bottom="-174" drop_shadow_visible="true" enabled="true" follows="left|top"
+	     bottom="-154" drop_shadow_visible="true" enabled="true" follows="left|top"
 	     font="SansSerif" h_pad="0" halign="left" height="16" left="13"
 	     mouse_opaque="true" name="Items to include in outfit:" v_pad="0"
 	     width="489">
@@ -263,24 +263,24 @@
 	     label="Uncheck All" left_delta="100" mouse_opaque="true"
 	     name="Uncheck All" scale_image="true" width="82" />
   <text type="string" length="1" bg_visible="false" border_drop_shadow_visible="false" border_visible="false"
-	     bottom="-196" drop_shadow_visible="true" enabled="true" follows="left|top"
+	     bottom="-176" drop_shadow_visible="true" enabled="true" follows="left|top"
 	     font="SansSerifSmall" h_pad="0" halign="left" height="14" left="13"
 	     mouse_opaque="true" name="Body Parts:" v_pad="0" width="100">
     Body Parts:
   </text>
   <text type="string" length="1" bg_visible="false" border_drop_shadow_visible="false" border_visible="false"
-	     bottom="-196" drop_shadow_visible="true" enabled="true" follows="left|top"
+	     bottom_delta="0" drop_shadow_visible="true" enabled="true" follows="left|top"
 	     font="SansSerifSmall" h_pad="0" halign="left" height="14" left="113"
 	     mouse_opaque="true" name="Clothes:" v_pad="0" width="100">
     Clothes:
   </text>
   <text type="string" length="1" bg_visible="false" border_drop_shadow_visible="false" border_visible="false"
-	     bottom="-196" drop_shadow_visible="true" enabled="true" follows="left|top"
+	     bottom_delta="0" drop_shadow_visible="true" enabled="true" follows="left|top"
 	     font="SansSerifSmall" h_pad="0" halign="left" height="14" left="213"
 	     mouse_opaque="true" name="Attachments:" v_pad="0" width="100">
     Attachments:
   </text>
-  <line_editor bevel_style="in" border_style="line" border_thickness="1" bottom="-150"
+  <line_editor bevel_style="in" border_style="line" border_thickness="1" bottom="-130"
 	     enabled="true" follows="left|top" font="SansSerif"
 	     handle_edit_keys_directly="true" height="20" left="13" max_length="63"
 	     mouse_opaque="true" name="name ed" select_all_on_focus_received="false"