Merge pull request #1745 from secondlife/project/gltf_development

move project/gltf development to develop

1 files changed, 16 insertions, 0 deletions

diff --git a/indra/llcommon/llbase64.cpp b/indra/llcommon/llbase64.cpp
index dbbbec9813..b8185a0c84 100644
--- a/indra/llcommon/llbase64.cpp
+++ b/indra/llcommon/llbase64.cpp
@@ -59,3 +59,19 @@ std::string LLBase64::encode(const U8* input, size_t input_size)
     return output;
 }
 
+std::string LLBase64::decodeAsString(const std::string &input)
+{
+    int b64_buffer_length = apr_base64_decode_len(input.c_str());
+    char* b64_buffer = new char[b64_buffer_length];
+
+        // This is faster than apr_base64_encode() if you know
+        // you're not on an EBCDIC machine.  Also, the output is
+        // null terminated, even though the documentation doesn't
+        // specify.  See apr_base64.c for details. JC
+    b64_buffer_length = apr_base64_decode(b64_buffer, input.c_str());
+    std::string res;
+    res.assign(b64_buffer);
+    delete[] b64_buffer;
+    return res;
+}
+