Merged work for DEV-2066 (and formerly QAR-1538) in Viewer 2.

merged all changes, post copy, from the following branches:
linden/brachnes/enable-o-v
user/cg/qar-1538
user/mani/viewer2-enable-o-v

1 files changed, 6 insertions, 6 deletions

diff --git a/indra/newview/llpanelpick.h b/indra/newview/llpanelpick.h
index fd07d9ef91..db943f4eaf 100644
--- a/indra/newview/llpanelpick.h
+++ b/indra/newview/llpanelpick.h
@@ -82,13 +82,13 @@ public:
 
 protected:
 
-	void setName(std::string name);
-	void setDesc(std::string desc);
-	void setLocation(std::string location);
+	void setPickName(std::string name);
+	void setPickDesc(std::string desc);
+	void setPickLocation(std::string location);
 
-	std::string getName();
-	std::string getDesc();
-	std::string getLocation();
+	std::string getPickName();
+	std::string getPickDesc();
+	std::string getPickLocation();
 
 	void sendUpdate();
 	void requestData();