1 files changed, 9 insertions, 2 deletions
diff --git a/indra/llmessage/llcorehttputil.cpp b/indra/llmessage/llcorehttputil.cpp
index dd9cb2032a..a32c4cad22 100644
--- a/indra/llmessage/llcorehttputil.cpp
+++ b/indra/llmessage/llcorehttputil.cpp
@@ -241,12 +241,19 @@ void HttpCoroHandler::onCompleted(LLCore::HttpHandle handle, LLCore::HttpRespons
         }
 
         if (result.isUndefined())
-        {
-            // If we've gotten to this point and the result LLSD is still undefined 
+        {   // If we've gotten to this point and the result LLSD is still undefined 
             // either there was an issue deserializing the body or the response was
             // blank.  Create an empty map to hold the result either way.
             result = LLSD::emptyMap();
         }
+        else if (!result.isMap())
+        {   // The results are not themselves a map.  Move them down so that 
+            // this method can return a map to the caller.
+            // *TODO: Should it always do this?
+            LLSD newResult = LLSD::emptyMap();
+            newResult["content"] = result;
+            result = newResult;
+        }
     }
 
     buildStatusEntry(response, status, result);