From 98c184619b62e1d0e4e0f40613449a643604eba9 Mon Sep 17 00:00:00 2001
From: "Nyx (Neal Orman)" <nyx@lindenlab.com>
Date: Mon, 23 Nov 2009 11:32:30 -0500
Subject: EXT-829 share button in profile inactive

Pass number 2 - re-enabled share button in the locations where it should exist
and disabled it in others. Next pass will be making all buttons functional.

Will be post-reviewed before pushing

--HG--
branch : avatar-pipeline
---
 indra/newview/llpanelavatar.cpp                              | 2 +-
 indra/newview/llpanelavatar.h                                | 5 +++++
 indra/newview/skins/default/xui/en/menu_profile_overflow.xml | 7 +++++++
 3 files changed, 13 insertions(+), 1 deletion(-)

diff --git a/indra/newview/llpanelavatar.cpp b/indra/newview/llpanelavatar.cpp
index 7f4a22aaf7..a822897c7e 100644
--- a/indra/newview/llpanelavatar.cpp
+++ b/indra/newview/llpanelavatar.cpp
@@ -528,7 +528,7 @@ void LLPanelAvatarProfile::pay()
 
 void LLPanelAvatarProfile::share()
 {
-	LLAvatarActions::share(getAvatarID());
+	LLAvatarActions::share(getAvatarId());
 }
 
 void LLPanelAvatarProfile::onUrlTextboxClicked(const std::string& url)
diff --git a/indra/newview/llpanelavatar.h b/indra/newview/llpanelavatar.h
index a0caf0c915..587b9cabe9 100644
--- a/indra/newview/llpanelavatar.h
+++ b/indra/newview/llpanelavatar.h
@@ -172,6 +172,11 @@ protected:
 	 */
 	void pay();
 
+	/**
+	 * opens inventory and IM for sharing items
+	 */
+	void share();
+
 	void onUrlTextboxClicked(const std::string& url);
 	void onHomepageTextboxClicked();
 	void onAddFriendButtonClick();
diff --git a/indra/newview/skins/default/xui/en/menu_profile_overflow.xml b/indra/newview/skins/default/xui/en/menu_profile_overflow.xml
index 7b52fecef7..d0128d1c9a 100644
--- a/indra/newview/skins/default/xui/en/menu_profile_overflow.xml
+++ b/indra/newview/skins/default/xui/en/menu_profile_overflow.xml
@@ -12,4 +12,11 @@
         <menu_item_call.on_click
          function="Profile.Pay" />
     </menu_item_call>
+    <menu_item_call
+     label="Share"
+     layout="topleft"
+     name="share">
+        <menu_item_call.on_click
+         function="Profile.Share" />
+    </menu_item_call>
 </toggleable_menu>
-- 
cgit v1.2.3