diff options
Diffstat (limited to 'linden/indra/newview/llfloateravatarinfo.h')
-rw-r--r-- | linden/indra/newview/llfloateravatarinfo.h | 13 |
1 files changed, 4 insertions, 9 deletions
diff --git a/linden/indra/newview/llfloateravatarinfo.h b/linden/indra/newview/llfloateravatarinfo.h index f305ae0..9b5fcb4 100644 --- a/linden/indra/newview/llfloateravatarinfo.h +++ b/linden/indra/newview/llfloateravatarinfo.h | |||
@@ -62,7 +62,6 @@ class LLFloaterAvatarInfo | |||
62 | : public LLPreview | 62 | : public LLPreview |
63 | { | 63 | { |
64 | public: | 64 | public: |
65 | |||
66 | static void* createPanelAvatar(void* data); | 65 | static void* createPanelAvatar(void* data); |
67 | 66 | ||
68 | virtual BOOL postBuild(); | 67 | virtual BOOL postBuild(); |
@@ -77,16 +76,14 @@ public: | |||
77 | /*virtual*/ void loadAsset(); | 76 | /*virtual*/ void loadAsset(); |
78 | /*virtual*/ EAssetStatus getAssetStatus(); | 77 | /*virtual*/ EAssetStatus getAssetStatus(); |
79 | 78 | ||
80 | // Enables rate button, enables IM | 79 | static LLFloaterAvatarInfo* show(const LLUUID& avatar_id); |
80 | // Core method, doesn't do anything funny with online status or | ||
81 | // tab selection. | ||
82 | |||
81 | static void showFromObject(const LLUUID &avatar_id, std::string tab_name = std::string()); | 83 | static void showFromObject(const LLUUID &avatar_id, std::string tab_name = std::string()); |
82 | 84 | ||
83 | // Disables the rate button, enables IM | ||
84 | static void showFromDirectory(const LLUUID &avatar_id); | 85 | static void showFromDirectory(const LLUUID &avatar_id); |
85 | 86 | ||
86 | // Enables all buttons | ||
87 | static void showFromAvatar(LLViewerObject *object); | ||
88 | |||
89 | // Enables most buttons | ||
90 | static void showFromFriend(const LLUUID& agent_id, BOOL online); | 87 | static void showFromFriend(const LLUUID& agent_id, BOOL online); |
91 | 88 | ||
92 | static LLFloaterAvatarInfo* getInstance(const LLUUID &id); | 89 | static LLFloaterAvatarInfo* getInstance(const LLUUID &id); |
@@ -94,8 +91,6 @@ public: | |||
94 | void resetGroupList(); | 91 | void resetGroupList(); |
95 | 92 | ||
96 | private: | 93 | private: |
97 | |||
98 | protected: | ||
99 | LLUUID mAvatarID; // for which avatar is this window? | 94 | LLUUID mAvatarID; // for which avatar is this window? |
100 | LLPanelAvatar* mPanelAvatarp; | 95 | LLPanelAvatar* mPanelAvatarp; |
101 | EOnlineStatus mSuggestedOnlineStatus; | 96 | EOnlineStatus mSuggestedOnlineStatus; |