summaryrefslogtreecommitdiff
path: root/indra/newview/llpanelprofile.h
diff options
context:
space:
mode:
Diffstat (limited to 'indra/newview/llpanelprofile.h')
-rw-r--r--indra/newview/llpanelprofile.h20
1 files changed, 13 insertions, 7 deletions
diff --git a/indra/newview/llpanelprofile.h b/indra/newview/llpanelprofile.h
index 1afc248073..c207a4162a 100644
--- a/indra/newview/llpanelprofile.h
+++ b/indra/newview/llpanelprofile.h
@@ -78,6 +78,12 @@ public:
void onOpen(const LLSD& key) override;
+ bool handleDragAndDrop(S32 x, S32 y, MASK mask, bool drop,
+ EDragAndDropType cargo_type,
+ void* cargo_data,
+ EAcceptance* accept,
+ std::string& tooltip_msg) override;
+
/**
* LLFriendObserver trigger
*/
@@ -85,11 +91,11 @@ public:
// Implements LLVoiceClientStatusObserver::onChange() to enable the call
// button when voice is available
- void onChange(EStatusType status, const std::string &channelURI, bool proximal) override;
+ void onChange(EStatusType status, const LLSD& channelInfo, bool proximal) override;
void setAvatarId(const LLUUID& avatar_id) override;
- BOOL postBuild() override;
+ bool postBuild() override;
void resetData() override;
@@ -136,7 +142,7 @@ protected:
*/
void fillAgeData(const LLAvatarData* avatar_data);
- void onImageLoaded(BOOL success, LLViewerFetchedTexture *imagep);
+ void onImageLoaded(bool success, LLViewerFetchedTexture *imagep);
/**
* Displays avatar's online status if possible.
@@ -219,7 +225,7 @@ public:
void onOpen(const LLSD& key) override;
- BOOL postBuild() override;
+ bool postBuild() override;
void resetData() override;
@@ -258,7 +264,7 @@ public:
void onOpen(const LLSD& key) override;
- BOOL postBuild() override;
+ bool postBuild() override;
void processProperties(void* data, EAvatarProcessorType type) override;
void processProperties(const LLAvatarData* avatar_data);
@@ -309,7 +315,7 @@ public:
void onOpen(const LLSD& key) override;
- BOOL postBuild() override;
+ bool postBuild() override;
void processProperties(void* data, EAvatarProcessorType type) override;
void processProperties(const LLAvatarData* avatar_data);
@@ -344,7 +350,7 @@ public:
LLPanelProfile();
/*virtual*/ ~LLPanelProfile();
- BOOL postBuild() override;
+ bool postBuild() override;
void updateData() override;
void refreshName();