Merge remote-tracking branch 'origin/DRTVWR-600-maint-A' into gltf-dev-maint-a-merge

1 files changed, 14 insertions, 8 deletions

diff --git a/indra/newview/llpanelprofile.h b/indra/newview/llpanelprofile.h
index 11632a10ae..b7a3840bca 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
 	 */
@@ -89,7 +95,7 @@ public:
 
 	void setAvatarId(const LLUUID& avatar_id) override;
 
-	BOOL postBuild() override;
+	bool postBuild() override;
 
 	void resetData() override;
 
@@ -145,13 +151,13 @@ protected:
      */
     void fillAgeData(const LLDate &born_on);
 
-    void onImageLoaded(BOOL success, LLViewerFetchedTexture *imagep);
-    static void onImageLoaded(BOOL success,
+    void onImageLoaded(bool success, LLViewerFetchedTexture *imagep);
+    static void onImageLoaded(bool success,
                               LLViewerFetchedTexture *src_vi,
                               LLImageRaw* src,
                               LLImageRaw* aux_src,
                               S32 discard_level,
-                              BOOL final,
+                              bool final,
                               void* userdata);
 
 	/**
@@ -234,7 +240,7 @@ public:
 
 	void onOpen(const LLSD& key) override;
 
-	BOOL postBuild() override;
+	bool postBuild() override;
 
 	void resetData() override;
 
@@ -275,7 +281,7 @@ public:
 
 	void onOpen(const LLSD& key) override;
 
-	BOOL postBuild() override;
+	bool postBuild() override;
 
     void processProperties(const LLAvatarData* avatar_data);
 
@@ -330,7 +336,7 @@ public:
 
 	void onOpen(const LLSD& key) override;
 
-	BOOL postBuild() override;
+	bool postBuild() override;
 
     void processProperties(LLAvatarNotes* avatar_notes);
 
@@ -366,7 +372,7 @@ public:
     LLPanelProfile();
     /*virtual*/ ~LLPanelProfile();
 
-    BOOL postBuild() override;
+    bool postBuild() override;
 
     void updateData() override;
     void refreshName();