summaryrefslogtreecommitdiff
path: root/indra/newview/llpanelavatar.h
diff options
context:
space:
mode:
authorOz Linden <oz@lindenlab.com>2010-12-02 14:08:23 -0500
committerOz Linden <oz@lindenlab.com>2010-12-02 14:08:23 -0500
commit375d91019eefa0f2bc4f4685fb0f34dac987b189 (patch)
treec4bbed389b33de9dc8fbc746bccccb6545307ad6 /indra/newview/llpanelavatar.h
parent732b1f748eb1844eb97ab2293ebc3b1bebb0c9e7 (diff)
parent20e192029ceaf7e9b6d097d6e65089d9011a4c0b (diff)
merge fix for STORM-679
Diffstat (limited to 'indra/newview/llpanelavatar.h')
-rw-r--r--indra/newview/llpanelavatar.h4
1 files changed, 0 insertions, 4 deletions
diff --git a/indra/newview/llpanelavatar.h b/indra/newview/llpanelavatar.h
index 11c7716322..71d9d0a95a 100644
--- a/indra/newview/llpanelavatar.h
+++ b/indra/newview/llpanelavatar.h
@@ -34,7 +34,6 @@
class LLComboBox;
class LLLineEditor;
-class LLToggleableMenu;
enum EOnlineStatus
{
@@ -207,14 +206,11 @@ protected:
void onCallButtonClick();
void onTeleportButtonClick();
void onShareButtonClick();
- void onOverflowButtonClicked();
private:
typedef std::map< std::string,LLUUID> group_map_t;
group_map_t mGroups;
-
- LLToggleableMenu* mProfileMenu;
};
/**