13 files changed, 37 insertions, 33 deletions

diff --git a/linden/indra/llmessage/CMakeLists.txt b/linden/indra/llmessage/CMakeLists.txt
index 4723281..a5e4249 100644
--- a/linden/indra/llmessage/CMakeLists.txt
+++ b/linden/indra/llmessage/CMakeLists.txt
@@ -218,7 +218,7 @@ IF (NOT LINUX AND VIEWER)
     # These can not be found when we try to run the tests, so we had to disable them, for the viewer build.
     # TODO: Can someone with viewer knowledge figure out how to make these find the correct so.
     #ADD_BUILD_TEST(llhttpclientadapter llmessage)
-    ADD_BUILD_TEST(lltrustedmessageservice llmessage)
-    ADD_BUILD_TEST(lltemplatemessagedispatcher llmessage)
+        #ADD_BUILD_TEST(lltrustedmessageservice llmessage)
+        #ADD_BUILD_TEST(lltemplatemessagedispatcher llmessage)
 ENDIF (NOT LINUX AND VIEWER)
 
diff --git a/linden/indra/llmessage/llassetstorage.cpp b/linden/indra/llmessage/llassetstorage.cpp
index 16a96b7..0ab1081 100644
--- a/linden/indra/llmessage/llassetstorage.cpp
+++ b/linden/indra/llmessage/llassetstorage.cpp
@@ -1028,12 +1028,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
 {
@@ -1116,11 +1116,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
 {
@@ -1139,7 +1139,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)
@@ -1150,7 +1150,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/linden/indra/llmessage/llassetstorage.h b/linden/indra/llmessage/llassetstorage.h
index c094ef4..83cfdf6 100644
--- a/linden/indra/llmessage/llassetstorage.h
+++ b/linden/indra/llmessage/llassetstorage.h
@@ -315,15 +315,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/linden/indra/llmessage/llcurl.cpp b/linden/indra/llmessage/llcurl.cpp
index 12321fe..202332c 100644
--- a/linden/indra/llmessage/llcurl.cpp
+++ b/linden/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/linden/indra/llmessage/llcurl.h b/linden/indra/llmessage/llcurl.h
index 3e9c0d4..32637b2 100644
--- a/linden/indra/llmessage/llcurl.h
+++ b/linden/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/linden/indra/llmessage/llhttpassetstorage.cpp b/linden/indra/llmessage/llhttpassetstorage.cpp
index dfdad59..49dbdbd 100644
--- a/linden/indra/llmessage/llhttpassetstorage.cpp
+++ b/linden/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/linden/indra/llmessage/llhttpassetstorage.h b/linden/indra/llmessage/llhttpassetstorage.h
index 5786c5d..231437d 100644
--- a/linden/indra/llmessage/llhttpassetstorage.h
+++ b/linden/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/linden/indra/llmessage/llhttpnode.cpp b/linden/indra/llmessage/llhttpnode.cpp
index 2ba900a..440b91f 100644
--- a/linden/indra/llmessage/llhttpnode.cpp
+++ b/linden/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/linden/indra/llmessage/llhttpnode.h b/linden/indra/llmessage/llhttpnode.h
index 17ffd66..87f0c48 100644
--- a/linden/indra/llmessage/llhttpnode.h
+++ b/linden/indra/llmessage/llhttpnode.h
@@ -83,10 +83,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.
@@ -116,7 +116,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();
diff --git a/linden/indra/llmessage/llpumpio.cpp b/linden/indra/llmessage/llpumpio.cpp
index 3e3f0b3..8ef2b16 100644
--- a/linden/indra/llmessage/llpumpio.cpp
+++ b/linden/indra/llmessage/llpumpio.cpp
@@ -43,6 +43,7 @@
 #include "llmemtype.h"
 #include "llstl.h"
 #include "llstat.h"
+#include "llfasttimer.h"
 
 // These should not be enabled in production, but they can be
 // intensely useful during development for finding certain kinds of
diff --git a/linden/indra/llmessage/llregionpresenceverifier.cpp b/linden/indra/llmessage/llregionpresenceverifier.cpp
index 24410a7..04eba34 100644
--- a/linden/indra/llmessage/llregionpresenceverifier.cpp
+++ b/linden/indra/llmessage/llregionpresenceverifier.cpp
@@ -30,6 +30,7 @@
  * $/LicenseInfo$
  */
 
+#include "linden_common.h"
 #include "llregionpresenceverifier.h"
 #include "llhttpclientinterface.h"
 #include <sstream>
diff --git a/linden/indra/llmessage/llsdappservices.cpp b/linden/indra/llmessage/llsdappservices.cpp
index dc135c5..b87c0cd 100644
--- a/linden/indra/llmessage/llsdappservices.cpp
+++ b/linden/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/linden/indra/llmessage/llsdhttpserver.cpp b/linden/indra/llmessage/llsdhttpserver.cpp
index 00fc170..7d06c29 100644
--- a/linden/indra/llmessage/llsdhttpserver.cpp
+++ b/linden/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;
         }