From 27c855149e657cebda863e279c8545f7816e1c18 Mon Sep 17 00:00:00 2001 From: Loren Shih Date: Mon, 23 Aug 2010 13:36:28 -0400 Subject: First pass commit for breast physics. --- indra/newview/llsidepanelappearance.h | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) (limited to 'indra/newview/llsidepanelappearance.h') diff --git a/indra/newview/llsidepanelappearance.h b/indra/newview/llsidepanelappearance.h index f28cdfa49a..022280132e 100644 --- a/indra/newview/llsidepanelappearance.h +++ b/indra/newview/llsidepanelappearance.h @@ -59,7 +59,8 @@ public: void showOutfitsInventoryPanel(); void showOutfitEditPanel(); - void showWearableEditPanel(LLWearable *wearable = NULL); + void showWearableEditPanel(LLWearable *wearable = NULL, BOOL disable_camera_switch = FALSE); + void showPhysicsEditPanel(LLWearable *wearable = NULL); void setWearablesLoading(bool val); void showDefaultSubpart(); void updateScrollingPanelList(); @@ -71,7 +72,7 @@ private: void onOpenOutfitButtonClicked(); void onEditAppearanceButtonClicked(); - void togglMyOutfitsPanel(BOOL visible); + void toggleMyOutfitsPanel(BOOL visible); void toggleOutfitEditPanel(BOOL visible, BOOL disable_camera_switch = FALSE); void toggleWearableEditPanel(BOOL visible, LLWearable* wearable = NULL, BOOL disable_camera_switch = FALSE); -- cgit v1.2.3 From 981a43b355e44daa7e1b4065b896ea4cd2fec3a2 Mon Sep 17 00:00:00 2001 From: Loren Shih Date: Mon, 23 Aug 2010 16:13:10 -0400 Subject: Created new wearable type. Added debug setting for disabling physics. Added disable-multiwear and disable-camera-reset to wearabletype. --- indra/newview/llsidepanelappearance.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'indra/newview/llsidepanelappearance.h') diff --git a/indra/newview/llsidepanelappearance.h b/indra/newview/llsidepanelappearance.h index 022280132e..70c8b7b797 100644 --- a/indra/newview/llsidepanelappearance.h +++ b/indra/newview/llsidepanelappearance.h @@ -51,7 +51,7 @@ public: void refreshCurrentOutfitName(const std::string& name = ""); - static void editWearable(LLWearable *wearable, LLView *data); + static void editWearable(LLWearable *wearable, LLView *data, BOOL disable_camera_switch = FALSE); void fetchInventory(); void inventoryFetched(); -- cgit v1.2.3 From 2c6a9dd47e617c79ab3df4d758cd9f2e6b77c21a Mon Sep 17 00:00:00 2001 From: Loren Shih Date: Mon, 23 Aug 2010 17:38:31 -0400 Subject: Changed "Range" to "Max Velocity" Changed logic to reset to user params if velocity is 0. Code cleanup. Took out extraneous "Physics" accordions from previous implementation. --- indra/newview/llsidepanelappearance.h | 1 - 1 file changed, 1 deletion(-) (limited to 'indra/newview/llsidepanelappearance.h') diff --git a/indra/newview/llsidepanelappearance.h b/indra/newview/llsidepanelappearance.h index 70c8b7b797..1a200e255c 100644 --- a/indra/newview/llsidepanelappearance.h +++ b/indra/newview/llsidepanelappearance.h @@ -60,7 +60,6 @@ public: void showOutfitsInventoryPanel(); void showOutfitEditPanel(); void showWearableEditPanel(LLWearable *wearable = NULL, BOOL disable_camera_switch = FALSE); - void showPhysicsEditPanel(LLWearable *wearable = NULL); void setWearablesLoading(bool val); void showDefaultSubpart(); void updateScrollingPanelList(); -- cgit v1.2.3