livie
/
phoenix-firestorm
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Fixed backwards compatibility so that orig Breast params are preserved. 

Cleaned up some code.
Removed "Add" from right-click when multiwear is not permitted.
meow-7.2.2
Loren Shih 2010-08-23 17:12:10 -04:00
parent 981a43b355
commit 782a0cf811
3 changed files with 71 additions and 68 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

100
indra/newview/character/avatar_lad.xml
View File

@ -4044,7 +4044,7 @@
</param>
<param
id="507"
id="1087"
group="0"
sex="female"
name="Breast_Gravity"
@ -4061,6 +4061,24 @@
<param_morph />
</param>
<param
id="1088"
group="0"
sex="female"
name="Breast_Female_Cleavage"
label="Breast Cleavage"
wearable="shape"
edit_group="driven"
label_min="Separate"
label_max="Join"
value_default="0"
value_min="-.3"
value_max="1.3"
camera_elevation=".3"
camera_distance=".8">
<param_morph />
</param>
<param
id="628"
group="1"
@ -4111,24 +4129,6 @@
</param_morph>
</param>
<param
id="684"
group="0"
sex="female"
name="Breast_Female_Cleavage"
label="Breast Cleavage"
wearable="shape"
edit_group="driven"
label_min="Separate"
label_max="Join"
value_default="0"
value_min="-.3"
value_max="1.3"
camera_elevation=".3"
camera_distance=".8">
<param_morph />
</param>
<param
id="685"
group="0"
@ -9083,7 +9083,7 @@ render_pass="bump">
edit_group="physics"
label_min="Less"
label_max="More"
value_default="1"
value_default="2"
value_min="1"
value_max="5"
camera_elevation=".3"
@ -9121,7 +9121,7 @@ render_pass="bump">
label_max="More"
value_default="0"
value_min="0"
value_max="2"
value_max="1"
camera_elevation=".3"
camera_distance=".8">
<param_driver />
@ -9209,9 +9209,9 @@ render_pass="bump">
edit_group="physics"
label_min="Less"
label_max="More"
value_default="10"
value_default="0"
value_min="0"
value_max="100"
value_max="10"
camera_elevation=".3"
camera_distance=".8">
<param_driver />
@ -9300,45 +9300,23 @@ render_pass="bump">
edit_group="physics"
label_min="Less"
label_max="More"
value_default="10"
value_default="0"
value_min="0"
value_max="100"
value_max="10"
camera_elevation=".3"
camera_distance=".8">
<param_driver />
</param>
<param
id="1087"
group="0"
sex="female"
name="Breast_Female_Cleavage_Driver"
label="Breast Cleavage"
wearable="shape"
edit_group="shape_torso"
label_min="Less"
label_max="More"
value_default="10"
value_min="-.3"
value_max="1.3"
camera_elevation=".3"
camera_distance=".8">
<param_driver>
<driven
id="684" />
</param_driver>
</param>
<param
id="1088"
id="507"
group="0"
sex="female"
name="Breast_Gravity_Driver"
label="Breast Buoyancy"
wearable="shape"
edit_group="shape_torso"
edit_group_order="7"
label_min="Less"
label_max="More"
value_default="10"
@ -9348,7 +9326,29 @@ render_pass="bump">
camera_distance=".8">
<param_driver>
<driven
id="507" />
id="1087" />
</param_driver>
</param>
<param
id="684"
group="0"
sex="female"
name="Breast_Female_Cleavage_Driver"
label="Breast Cleavage"
wearable="shape"
edit_group="shape_torso"
edit_group_order="7"
label_min="Less"
label_max="More"
value_default="10"
value_min="-.3"
value_max="1.3"
camera_elevation=".3"
camera_distance=".8">
<param_driver>
<driven
id="1088" />
</param_driver>
</param>

11
indra/newview/llinventorybridge.cpp
View File

@ -4492,14 +4492,17 @@ void LLWearableBridge::buildContextMenu(LLMenuGL& menu, U32 flags)
else
{
items.push_back(std::string("Wearable And Object Wear"));
items.push_back(std::string("Wearable Add"));
disabled_items.push_back(std::string("Take Off"));
disabled_items.push_back(std::string("Wearable Edit"));
}
if (gAgentWearables.isWearingWearableType(mWearableType) &&
!LLWearableType::getAllowMultiwear(mWearableType))
if (LLWearableType::getAllowMultiwear(mWearableType))
{
disabled_items.push_back(std::string("Wearable Add"));
items.push_back(std::string("Wearable Add"));
if (gAgentWearables.getWearableCount(mWearableType) > 0)
{
disabled_items.push_back(std::string("Wearable Add"));
}
}
break;
default:

28
indra/newview/llvoavatar.cpp
View File

@ -789,7 +789,7 @@ public:
{
if (!gSavedSettings.getBOOL("AvatarPhysics"))
{
return FALSE;
return TRUE;
}
/*
@ -817,21 +817,21 @@ public:
6. Threshold for not setting param
*/
mBreastMassParam = ((LLViewerVisualParam*)mCharacter->getVisualParam("Breast_Physics_Mass"))->getWeight();
mBreastSmoothingParam = ((LLViewerVisualParam*)mCharacter->getVisualParam("Breast_Physics_Smoothing"))->getWeight();
mBreastGravityParam = ((LLViewerVisualParam*)mCharacter->getVisualParam("Breast_Physics_Gravity"))->getWeight();
mBreastMassParam = mCharacter->getVisualParamWeight("Breast_Physics_Mass");
mBreastSmoothingParam = mCharacter->getVisualParamWeight("Breast_Physics_Smoothing");
mBreastGravityParam = mCharacter->getVisualParamWeight("Breast_Physics_Gravity");
mBreastSpringParam[0] = ((LLViewerVisualParam*)mCharacter->getVisualParam("Breast_Physics_Side_Spring"))->getWeight();
mBreastGainParam[0] = ((LLViewerVisualParam*)mCharacter->getVisualParam("Breast_Physics_Side_Gain"))->getWeight();
mBreastDampingParam[0] = ((LLViewerVisualParam*)mCharacter->getVisualParam("Breast_Physics_Side_Damping"))->getWeight();
mBreastMaxVelocityParam[0] = ((LLViewerVisualParam*)mCharacter->getVisualParam("Breast_Physics_Side_Range"))->getWeight();
mBreastDragParam[0] = ((LLViewerVisualParam*)mCharacter->getVisualParam("Breast_Physics_Side_Drag"))->getWeight();
mBreastSpringParam[0] = mCharacter->getVisualParamWeight("Breast_Physics_Side_Spring");
mBreastGainParam[0] = mCharacter->getVisualParamWeight("Breast_Physics_Side_Gain");
mBreastDampingParam[0] = mCharacter->getVisualParamWeight("Breast_Physics_Side_Damping");
mBreastMaxVelocityParam[0] = mCharacter->getVisualParamWeight("Breast_Physics_Side_Range");
mBreastDragParam[0] = mCharacter->getVisualParamWeight("Breast_Physics_Side_Drag");
mBreastSpringParam[2] = ((LLViewerVisualParam*)mCharacter->getVisualParam("Breast_Physics_UpDown_Spring"))->getWeight();
mBreastGainParam[2] = ((LLViewerVisualParam*)mCharacter->getVisualParam("Breast_Physics_UpDown_Gain"))->getWeight();
mBreastDampingParam[2] = ((LLViewerVisualParam*)mCharacter->getVisualParam("Breast_Physics_UpDown_Damping"))->getWeight();
mBreastMaxVelocityParam[2] = ((LLViewerVisualParam*)mCharacter->getVisualParam("Breast_Physics_UpDown_Range"))->getWeight();
mBreastDragParam[2] = ((LLViewerVisualParam*)mCharacter->getVisualParam("Breast_Physics_UpDown_Drag"))->getWeight();
mBreastSpringParam[2] = mCharacter->getVisualParamWeight("Breast_Physics_UpDown_Spring");
mBreastGainParam[2] = mCharacter->getVisualParamWeight("Breast_Physics_UpDown_Gain");
mBreastDampingParam[2] = mCharacter->getVisualParamWeight("Breast_Physics_UpDown_Damping");
mBreastMaxVelocityParam[2] = mCharacter->getVisualParamWeight("Breast_Physics_UpDown_Range");
mBreastDragParam[2] = mCharacter->getVisualParamWeight("Breast_Physics_UpDown_Drag");
if (mCharacter->getSex() != SEX_FEMALE) return TRUE;
const F32 time_delta = calculateTimeDelta();