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

15 files changed, 41 insertions, 36 deletions

diff --git a/indra/llmessage/llassetstorage.cpp b/indra/llmessage/llassetstorage.cpp
index 2966b602d7..b3087bcc3f 100644
--- a/indra/llmessage/llassetstorage.cpp
+++ b/indra/llmessage/llassetstorage.cpp
@@ -1025,12 +1025,12 @@ LLSD LLAssetStorage::getPendingDetails(LLAssetStorage::ERequestType rt,
 {
 	const request_list_t* requests = getRequestList(rt);
 	LLSD sd;
-	sd["requests"] = getPendingDetails(requests, asset_type, detail_prefix);
+	sd["requests"] = getPendingDetailsImpl(requests, asset_type, detail_prefix);
 	return sd;
 }
 
 // virtual
-LLSD LLAssetStorage::getPendingDetails(const LLAssetStorage::request_list_t* requests,
+LLSD LLAssetStorage::getPendingDetailsImpl(const LLAssetStorage::request_list_t* requests,
 										LLAssetType::EType asset_type,
 										const std::string& detail_prefix) const
 {
@@ -1113,11 +1113,11 @@ LLSD LLAssetStorage::getPendingRequest(LLAssetStorage::ERequestType rt,
 										const LLUUID& asset_id) const
 {
 	const request_list_t* requests = getRequestList(rt);
-	return getPendingRequest(requests, asset_type, asset_id);
+	return getPendingRequestImpl(requests, asset_type, asset_id);
 }
 
 // virtual
-LLSD LLAssetStorage::getPendingRequest(const LLAssetStorage::request_list_t* requests,
+LLSD LLAssetStorage::getPendingRequestImpl(const LLAssetStorage::request_list_t* requests,
 										LLAssetType::EType asset_type,
 										const LLUUID& asset_id) const
 {
@@ -1136,7 +1136,7 @@ bool LLAssetStorage::deletePendingRequest(LLAssetStorage::ERequestType rt,
 											const LLUUID& asset_id)
 {
 	request_list_t* requests = getRequestList(rt);
-	if (deletePendingRequest(requests, asset_type, asset_id))
+	if (deletePendingRequestImpl(requests, asset_type, asset_id))
 	{
 		llinfos << "Asset " << getRequestName(rt) << " request for "
 				<< asset_id << "." << LLAssetType::lookup(asset_type)
@@ -1147,7 +1147,7 @@ bool LLAssetStorage::deletePendingRequest(LLAssetStorage::ERequestType rt,
 }
 
 // virtual
-bool LLAssetStorage::deletePendingRequest(LLAssetStorage::request_list_t* requests,
+bool LLAssetStorage::deletePendingRequestImpl(LLAssetStorage::request_list_t* requests,
 											LLAssetType::EType asset_type,
 											const LLUUID& asset_id)
 {
diff --git a/indra/llmessage/llassetstorage.h b/indra/llmessage/llassetstorage.h
index f01ee6a8e8..56adbd5ccf 100644
--- a/indra/llmessage/llassetstorage.h
+++ b/indra/llmessage/llassetstorage.h
@@ -306,15 +306,15 @@ public:
 	void		markAssetToxic( const LLUUID& uuid );
 
 protected:
-	virtual LLSD getPendingDetails(const request_list_t* requests,
+	virtual LLSD getPendingDetailsImpl(const request_list_t* requests,
 	 				LLAssetType::EType asset_type,
 	 				const std::string& detail_prefix) const;
 
-	virtual LLSD getPendingRequest(const request_list_t* requests,
+	virtual LLSD getPendingRequestImpl(const request_list_t* requests,
 							LLAssetType::EType asset_type,
 							const LLUUID& asset_id) const;
 
-	virtual bool deletePendingRequest(request_list_t* requests,
+	virtual bool deletePendingRequestImpl(request_list_t* requests,
 							LLAssetType::EType asset_type,
 							const LLUUID& asset_id);
 
diff --git a/indra/llmessage/llcurl.cpp b/indra/llmessage/llcurl.cpp
index 1a432cd7df..a4af8e989b 100644
--- a/indra/llmessage/llcurl.cpp
+++ b/indra/llmessage/llcurl.cpp
@@ -120,7 +120,7 @@ LLCurl::Responder::~Responder()
 }
 
 // virtual
-void LLCurl::Responder::error(
+void LLCurl::Responder::errorWithContent(
 	U32 status,
 	const std::string& reason,
 	const LLSD&)
@@ -161,7 +161,7 @@ void LLCurl::Responder::completed(U32 status, const std::string& reason, const L
 	}
 	else
 	{
-		error(status, reason, content);
+		errorWithContent(status, reason, content);
 	}
 }
 
diff --git a/indra/llmessage/llcurl.h b/indra/llmessage/llcurl.h
index ff63904c91..fbd3077cbf 100644
--- a/indra/llmessage/llcurl.h
+++ b/indra/llmessage/llcurl.h
@@ -85,7 +85,7 @@ public:
 			return((200 <= status) && (status < 300));
 		}
 		
-		virtual void error(
+		virtual void errorWithContent(
 			U32 status,
 			const std::string& reason,
 			const LLSD& content);
diff --git a/indra/llmessage/llhttpassetstorage.cpp b/indra/llmessage/llhttpassetstorage.cpp
index dfdad59e2a..49dbdbd56d 100644
--- a/indra/llmessage/llhttpassetstorage.cpp
+++ b/indra/llmessage/llhttpassetstorage.cpp
@@ -626,7 +626,7 @@ LLSD LLHTTPAssetStorage::getPendingRequest(LLAssetStorage::ERequestType rt,
 	const request_list_t* running = getRunningList(rt);
 	if (running)
 	{
-		LLSD sd = LLAssetStorage::getPendingRequest(running, asset_type, asset_id);
+		LLSD sd = LLAssetStorage::getPendingRequestImpl(running, asset_type, asset_id);
 		if (sd)
 		{
 			sd["is_running"] = true;
diff --git a/indra/llmessage/llhttpassetstorage.h b/indra/llmessage/llhttpassetstorage.h
index 5786c5df32..231437dad4 100644
--- a/indra/llmessage/llhttpassetstorage.h
+++ b/indra/llmessage/llhttpassetstorage.h
@@ -62,6 +62,8 @@ public:
 
 	virtual ~LLHTTPAssetStorage();
 
+	using LLAssetStorage::storeAssetData; // Unhiding virtuals...
+
 	virtual void storeAssetData(
 		const LLUUID& uuid,
 		LLAssetType::EType atype,
diff --git a/indra/llmessage/llhttpnode.cpp b/indra/llmessage/llhttpnode.cpp
index 2ba900a533..440b91fcfa 100644
--- a/indra/llmessage/llhttpnode.cpp
+++ b/indra/llmessage/llhttpnode.cpp
@@ -98,19 +98,19 @@ namespace {
 }
 
 // virtual
-LLSD LLHTTPNode::get() const
+LLSD LLHTTPNode::simpleGet() const
 {
 	throw NotImplemented();
 }
 
 // virtual
-LLSD LLHTTPNode::put(const LLSD& input) const
+LLSD LLHTTPNode::simplePut(const LLSD& input) const
 {
 	throw NotImplemented();
 }
 
 // virtual
-LLSD LLHTTPNode::post(const LLSD& input) const
+LLSD LLHTTPNode::simplePost(const LLSD& input) const
 {
 	throw NotImplemented();
 }
@@ -121,7 +121,7 @@ void LLHTTPNode::get(LLHTTPNode::ResponsePtr response, const LLSD& context) cons
 {
 	try
 	{
-		response->result(get());
+		response->result(simpleGet());
 	}
 	catch (NotImplemented)
 	{
@@ -134,7 +134,7 @@ void LLHTTPNode::put(LLHTTPNode::ResponsePtr response, const LLSD& context, cons
 {
 	try
 	{
-		response->result(put(input));
+		response->result(simplePut(input));
 	}
 	catch (NotImplemented)
 	{
@@ -147,7 +147,7 @@ void LLHTTPNode::post(LLHTTPNode::ResponsePtr response, const LLSD& context, con
 {
 	try
 	{
-		response->result(post(input));
+		response->result(simplePost(input));
 	}
 	catch (NotImplemented)
 	{
@@ -160,7 +160,7 @@ void LLHTTPNode::del(LLHTTPNode::ResponsePtr response, const LLSD& context) cons
 {
     try
     {
-	response->result(del(context));
+	response->result(simpleDel(context));
     }
     catch (NotImplemented)
     {
@@ -170,7 +170,7 @@ void LLHTTPNode::del(LLHTTPNode::ResponsePtr response, const LLSD& context) cons
 }
 
 // virtual
-LLSD LLHTTPNode::del(const LLSD&) const
+LLSD LLHTTPNode::simpleDel(const LLSD&) const
 {
 	throw NotImplemented();
 }
@@ -388,7 +388,7 @@ LLHTTPNode::Response::~Response()
 {
 }
 
-void LLHTTPNode::Response::status(S32 code)
+void LLHTTPNode::Response::statusUnknownError(S32 code)
 {
 	status(code, "Unknown Error");
 }
diff --git a/indra/llmessage/llhttpnode.h b/indra/llmessage/llhttpnode.h
index 3f4da69a1d..915aacb7cc 100644
--- a/indra/llmessage/llhttpnode.h
+++ b/indra/llmessage/llhttpnode.h
@@ -84,10 +84,10 @@ public:
 	//@{
 public:	
 
-	virtual LLSD get() const;
-	virtual LLSD put(const LLSD& input) const;
-	virtual LLSD post(const LLSD& input) const;
-	virtual LLSD del(const LLSD& context) const;
+	virtual LLSD simpleGet() const;
+	virtual LLSD simplePut(const LLSD& input) const;
+	virtual LLSD simplePost(const LLSD& input) const;
+	virtual LLSD simpleDel(const LLSD& context) const;
 
 	/**
 	* @brief Abstract Base Class declaring Response interface.
@@ -117,7 +117,7 @@ public:
 		/**
 		* @brief Return no body, just status code and 'UNKNOWN ERROR'.
 		*/
-		virtual void status(S32 code);
+		virtual void statusUnknownError(S32 code);
 
 		virtual void notFound(const std::string& message);
 		virtual void notFound();
@@ -293,6 +293,7 @@ public:
 	
 	void result(const LLSD& result);
 	void extendedResult(S32 code, const std::string& body, const LLSD& headers);
+	
 	void status(S32 code, const std::string& message);
 
 	void print(std::ostream& out) const;
diff --git a/indra/llmessage/lliohttpserver.cpp b/indra/llmessage/lliohttpserver.cpp
index 83dfa94f00..a00dbd1809 100644
--- a/indra/llmessage/lliohttpserver.cpp
+++ b/indra/llmessage/lliohttpserver.cpp
@@ -105,6 +105,7 @@ private:
 		// from LLHTTPNode::Response
 		virtual void result(const LLSD&);
 		virtual void extendedResult(S32 code, const std::string& body, const LLSD& headers);
+		
 		virtual void status(S32 code, const std::string& message);
 
 		void nullPipe();
diff --git a/indra/llmessage/llregionpresenceverifier.h b/indra/llmessage/llregionpresenceverifier.h
index 10602450d8..54ad6226d6 100644
--- a/indra/llmessage/llregionpresenceverifier.h
+++ b/indra/llmessage/llregionpresenceverifier.h
@@ -82,6 +82,7 @@ public:
 	public:
 		VerifiedDestinationResponder(ResponsePtr data, const LLSD& content);
 		virtual void result(const LLSD& content);
+		
 		virtual void error(U32 status, const std::string& reason);
 	private:
 		void retry();
diff --git a/indra/llmessage/llsdappservices.cpp b/indra/llmessage/llsdappservices.cpp
index dc135c51b2..b87c0cd6b7 100644
--- a/indra/llmessage/llsdappservices.cpp
+++ b/indra/llmessage/llsdappservices.cpp
@@ -56,7 +56,7 @@ public:
 		desc.source(__FILE__, __LINE__);
 	}
     
-	virtual LLSD get() const
+	virtual LLSD simpleGet() const
 	{
 		LLSD result;
 		LLApp* app = LLApp::instance();
@@ -82,7 +82,7 @@ public:
 		desc.source(__FILE__, __LINE__);
 	}
     
-	virtual LLSD get() const
+	virtual LLSD simpleGet() const
 	{
 		return LLApp::instance()->getOptionData(
 			LLApp::PRIORITY_RUNTIME_OVERRIDE);
diff --git a/indra/llmessage/llsdhttpserver.cpp b/indra/llmessage/llsdhttpserver.cpp
index 00fc170c59..704c375ffc 100644
--- a/indra/llmessage/llsdhttpserver.cpp
+++ b/indra/llmessage/llsdhttpserver.cpp
@@ -62,7 +62,7 @@ public:
 		desc.source(__FILE__, __LINE__);
 	}
     
-	virtual LLSD get() const
+	virtual LLSD simpleGet() const
 	{
 		LLSD result = "hello";
 		return result;
@@ -86,7 +86,7 @@ public:
 		desc.source(__FILE__, __LINE__);
 	}
 	
-    virtual LLSD post(const LLSD& params) const
+	virtual LLSD simplePost(const LLSD& params) const
 	{
 		return params;
 	}
diff --git a/indra/llmessage/llsdmessage.cpp b/indra/llmessage/llsdmessage.cpp
index f663268466..9967a6197f 100644
--- a/indra/llmessage/llsdmessage.cpp
+++ b/indra/llmessage/llsdmessage.cpp
@@ -91,7 +91,7 @@ void LLSDMessage::EventResponder::result(const LLSD& data)
     }
 }
 
-void LLSDMessage::EventResponder::error(U32 status, const std::string& reason, const LLSD& content)
+void LLSDMessage::EventResponder::errorWithContent(U32 status, const std::string& reason, const LLSD& content)
 {
     // If our caller passed an empty errorPump name, they're not
     // listening: "default error handling is acceptable." Only post to an
@@ -135,7 +135,7 @@ bool LLSDMessage::ResponderAdapter::listener(const LLSD& payload, bool success)
     }
     else
     {
-        mResponder->error(payload["status"].asInteger(), payload["reason"], payload["content"]);
+        mResponder->errorWithContent(payload["status"].asInteger(), payload["reason"], payload["content"]);
     }
 
     /*---------------- MUST BE LAST STATEMENT BEFORE RETURN ----------------*/
diff --git a/indra/llmessage/llsdmessage.h b/indra/llmessage/llsdmessage.h
index 8ae9451243..65503756a8 100644
--- a/indra/llmessage/llsdmessage.h
+++ b/indra/llmessage/llsdmessage.h
@@ -131,7 +131,7 @@ private:
         {}
     
         virtual void result(const LLSD& data);
-        virtual void error(U32 status, const std::string& reason, const LLSD& content);
+        virtual void errorWithContent(U32 status, const std::string& reason, const LLSD& content);
     
     private:
         LLEventPumps& mPumps;
diff --git a/indra/llmessage/tests/llcurl_stub.cpp b/indra/llmessage/tests/llcurl_stub.cpp
index d6be54336a..5dc5932fde 100644
--- a/indra/llmessage/tests/llcurl_stub.cpp
+++ b/indra/llmessage/tests/llcurl_stub.cpp
@@ -34,7 +34,7 @@ void LLCurl::Responder::completed(U32 status, std::basic_string<char, std::char_
 	}
 	else
 	{
-		error(status, reason, mContent);
+		errorWithContent(status, reason, mContent);
 	}
 }
 
@@ -51,7 +51,7 @@ void LLCurl::Responder::completedRaw(unsigned,
 {
 }
 
-void LLCurl::Responder::error(unsigned,
+void LLCurl::Responder::errorWithContent(unsigned,
 							  std::basic_string<char, std::char_traits<char>, std::allocator<char> > const&,
 							  LLSD const&)
 {