Merging revisions 2070-2084 of https://svn.aws.productengine.com/secondlife/pe/stable-2 into P:\svn\viewer-2.0.0, respecting ancestry

* Bugs: EXT-792 EXT-1519 EXT-1514 EXT-1245 EXT-1600 EXT-1535 EXT-1174 EXT-1241
* Dev: EXT-1271 EXT-1601 EXT-1154

1 files changed, 24 insertions, 8 deletions

diff --git a/indra/newview/llpanelpicks.h b/indra/newview/llpanelpicks.h
index 18c571c735..6264a19318 100644
--- a/indra/newview/llpanelpicks.h
+++ b/indra/newview/llpanelpicks.h
@@ -44,11 +44,12 @@ class LLPanelProfile;
 class LLMessageSystem;
 class LLVector3d;
 class LLPanelProfileTab;
-class LLPanelPick;
 class LLAgent;
 class LLMenuGL;
 class LLPickItem;
 class LLFlatListView;
+class LLPanelPickInfo;
+class LLPanelPickEdit;
 
 class LLPanelPicks 
 	: public LLPanelProfileTab
@@ -74,11 +75,6 @@ public:
 	// parent panels failed to work (picks related code was in me profile panel)
 	void setProfilePanel(LLPanelProfile* profile_panel);
 
-	/**
-	 * Closes LLPanelPick if it is visible.
-	 */
-	/*virtual*/ void onClosePanel();
-
 private:
 	void onClickDelete();
 	void onClickTeleport();
@@ -89,7 +85,8 @@ private:
 	//------------------------------------------------
 	void onClickNew();
 	void onClickInfo();
-	void onClickBack();
+	void onPanelPickClose(LLPanel* panel);
+	void onPanelPickEdit();
 	void onClickMenuEdit();
 
 	void buildPickPanel();
@@ -104,10 +101,17 @@ private:
 
 	LLPanelProfile* getProfilePanel();
 
+	void createPickInfoPanel();
+	void createPickEditPanel();
+// 	void openPickEditPanel(LLPickItem* pick);
+// 	void openPickInfoPanel(LLPickItem* pick);
+
 	LLMenuGL* mPopupMenu;
 	LLPanelProfile* mProfilePanel;
-	LLPanelPick* mPickPanel;
+	LLPanelPickInfo* mPickPanel;
 	LLFlatListView* mPicksList;
+	LLPanelPickInfo* mPanelPickInfo;
+	LLPanelPickEdit* mPanelPickEdit;
 };
 
 class LLPickItem : public LLPanel, public LLAvatarPropertiesObserver
@@ -144,6 +148,14 @@ public:
 
 	const std::string getDescription();
 
+	const std::string& getSimName() { return mSimName; }
+
+	const std::string& getUserName() { return mUserName; }
+
+	const std::string& getOriginalName() { return mOriginalName; }
+
+	const std::string& getPickDesc() { return mPickDescription; }
+
 	/*virtual*/ void processProperties(void* data, EAvatarProcessorType type);
 
 	void update();
@@ -165,6 +177,10 @@ protected:
 	bool mNeedData;
 
 	std::string mPickName;
+	std::string mUserName;
+	std::string mOriginalName;
+	std::string mPickDescription;
+	std::string mSimName;
 };
 
 #endif // LL_LLPANELPICKS_H