diff -urN cv126511-old/indra/newview/llfloatermodelpreview.cpp cv126511/indra/newview/llfloatermodelpreview.cpp
--- cv126511-old/indra/newview/llfloatermodelpreview.cpp	2012-08-30 16:55:33.000000000 +0200
+++ cv126511/indra/newview/llfloatermodelpreview.cpp	2012-09-26 11:16:50.000000000 +0200
@@ -97,7 +97,7 @@
 #include "llviewerregion.h"
 #include "llviewertexturelist.h"
 #include "llviewerwindow.h"
-#include "llvoavatar.h"
+#include "llvoavatarself.h"
 #include "llweb.h"
 #include "pipeline.h"
 
@@ -3463,11 +3463,27 @@
 		parameters["visual_params"]["male"] = 1.0f;
 	}
 #if 0
-	if (base_type == 1) // female
+	else if (base_type == 1) // female
 	{
 		// female base needs no modifications
 	}
 #endif
+	else if (base_type == 2)
+	{
+		// Retrieve and store the visual parameters for our current shape
+		LLSD& vparams = parameters["visual_params"];
+		for (LLVisualParam* param = gAgentAvatarp->getFirstVisualParam();
+			 param; param = gAgentAvatarp->getNextVisualParam())
+		{
+			LLViewerVisualParam* viewer_param = (LLViewerVisualParam*)param;
+			if (viewer_param->getWearableType() == LLWearableType::WT_SHAPE &&
+				viewer_param->isTweakable())
+			{
+				vparams[viewer_param->getName().c_str()] = viewer_param->getWeight();
+			}
+		}
+	}
+
 	return parameters;
 }
 
diff -urN cv126511-old/indra/newview/skins/default/xui/en-us/floater_model_preview.xml cv126511/indra/newview/skins/default/xui/en-us/floater_model_preview.xml
--- cv126511-old/indra/newview/skins/default/xui/en-us/floater_model_preview.xml	2012-08-30 16:08:36.000000000 +0200
+++ cv126511/indra/newview/skins/default/xui/en-us/floater_model_preview.xml	2012-09-26 11:26:29.000000000 +0200
@@ -482,14 +482,18 @@
 				<check_box name="deform" label="Deform to avatar shape:" follows="top|left"
 				 left="20" bottom_delta="-24" width="140" height="16"/>
 				<radio_group name="deform_base" draw_border="false"
-				 left_delta="195" bottom_delta="0" height="16" width="200" follows="top|left">
+				 left_delta="195" bottom_delta="0" height="16" width="330" follows="top|left">
 					<radio_item name="0" value="0"
-					 bottom="-16" left="0" height="16" width="90">
-						Male
+					 bottom="-16" left="0" height="16" width="100">
+						Default male
 					</radio_item>
 					<radio_item name="1" value="1"
-					 bottom="-16" left="100" height="16" width="90">
-						Female
+					 bottom="-16" left="110" height="16" width="100">
+						Default female
+					</radio_item>
+					<radio_item name="2" value="2"
+					 bottom="-16" left="220" height="16" width="100">
+						Worn shape
 					</radio_item>
 				</radio_group>
 			</panel>