diff options
| author | Oz Linden <oz@lindenlab.com> | 2010-12-27 14:29:11 -0500 |
|---|---|---|
| committer | Oz Linden <oz@lindenlab.com> | 2010-12-27 14:29:11 -0500 |
| commit | 433ad05ae9580027641c8bd5e1fe175f96669a66 (patch) | |
| tree | 02d565092ac4acff9feca2840774f01790fd135e /indra/newview/llsidepanelappearance.h | |
| parent | a9caa3151cea77b992c06c5a774d333ffd3016e1 (diff) | |
| parent | 9ea172a8e21913b115e676a022e80e784dfd5142 (diff) | |
merge up to latest viewer-development
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); |