summaryrefslogtreecommitdiff
path: root/indra/newview/llsidepanelappearance.h
diff options
context:
space:
mode:
authorOz Linden <oz@lindenlab.com>2011-04-14 15:15:48 -0400
committerOz Linden <oz@lindenlab.com>2011-04-14 15:15:48 -0400
commit572e491acf2d9ca1701ec54df31632cbc9c253c8 (patch)
tree4fa39e7b5263f76a62f73d08a1dc8ab550d4ec05 /indra/newview/llsidepanelappearance.h
parent71f5c1f5e8bbf6b22776cd7f98aabecc7a48918d (diff)
parentb49446c863644d603ec2e1f86f12d24b1c4375c2 (diff)
pull back tags from viewer-release
Diffstat (limited to 'indra/newview/llsidepanelappearance.h')
-rw-r--r--indra/newview/llsidepanelappearance.h6
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);