diff options
| author | Richard Linden <none@none> | 2011-04-06 15:15:33 -0700 |
|---|---|---|
| committer | Richard Linden <none@none> | 2011-04-06 15:15:33 -0700 |
| commit | 75ddf612ad29240d6d34b5044ae09e4295217766 (patch) | |
| tree | 70eeb78247ef3ae779809485afaaf592aa495b34 /indra/newview/llsidepanelappearance.h | |
| parent | 4dd471d055bea672f5eb21cfcc4d07e6b3ba3f9b (diff) | |
| parent | 80efbeead1d59b64b615f8a33cb0966cf7fef9f1 (diff) | |
Automated merge with ssh://hg.lindenlab.com/richard/viewer-social-2
Diffstat (limited to 'indra/newview/llsidepanelappearance.h')
| -rw-r--r-- | indra/newview/llsidepanelappearance.h | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/indra/newview/llsidepanelappearance.h b/indra/newview/llsidepanelappearance.h index 2a83dfbc9d..6dd3520266 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(); @@ -59,7 +59,7 @@ public: void showOutfitsInventoryPanel(); void showOutfitEditPanel(); - void showWearableEditPanel(LLWearable *wearable = NULL); + void showWearableEditPanel(LLWearable *wearable = NULL, BOOL disable_camera_switch = FALSE); void setWearablesLoading(bool val); void showDefaultSubpart(); void updateScrollingPanelList(); @@ -72,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); |