merge of latest viewer/viewer-20

1 files changed, 3 insertions, 6 deletions

diff --git a/indra/newview/llpanelpicks.h b/indra/newview/llpanelpicks.h
index 97e8e607c8..7ebdc3089c 100644
--- a/indra/newview/llpanelpicks.h
+++ b/indra/newview/llpanelpicks.h
@@ -48,7 +48,7 @@ class LLPanelPick;
 class LLAgent;
 class LLMenuGL;
 class LLPickItem;
-class LLListCtrl;
+class LLFlatListView;
 
 class LLPanelPicks 
 	: public LLPanelProfileTab
@@ -100,14 +100,14 @@ private:
 	void updateButtons();
 
 	virtual void onDoubleClickItem(LLUICtrl* item);
-	virtual void onRightMouseDownItem(LLUICtrl* item, S32 x, S32 y, MASK mask);
+	virtual void onRightMouseUpItem(LLUICtrl* item, S32 x, S32 y, MASK mask);
 
 	LLPanelProfile* getProfilePanel();
 
 	LLMenuGL* mPopupMenu;
 	LLPanelProfile* mProfilePanel;
 	LLPanelPick* mPickPanel;
-	LLListCtrl* mPicksList;
+	LLFlatListView* mPicksList;
 };
 
 class LLPickItem : public LLPanel, public LLAvatarPropertiesObserver
@@ -142,8 +142,6 @@ public:
 
 	const LLVector3d& getPosGlobal();
 
-	const std::string& getLocation();
-
 	const std::string getDescription();
 
 	/*virtual*/ void processProperties(void* data, EAvatarProcessorType type);
@@ -167,7 +165,6 @@ protected:
 	bool mNeedData;
 
 	std::string mPickName;
-	std::string mLocation;
 };
 
 #endif // LL_LLPANELPICKS_H