8 files changed, 131 insertions, 14 deletions

diff --git a/linden/indra/llcommon/llassettype.cpp b/linden/indra/llcommon/llassettype.cpp
index cf38f7a..051092e 100644
--- a/linden/indra/llcommon/llassettype.cpp
+++ b/linden/indra/llcommon/llassettype.cpp
@@ -27,9 +27,11 @@
 
 #include "linden_common.h"
 
+#include "llassettype.h"
+
 #include <time.h>
 
-#include "llassettype.h"
+#include "llstring.h"
 #include "lltimer.h"
 
 // I added lookups for exact text of asset type enums in addition to the ones below, so shoot me. -Steve
@@ -68,9 +70,9 @@ asset_info_t asset_types[] =
         { LLAssetType::AT_NONE, "NONE" },
 };
 
-LLAssetType::EType LLAssetType::getType(const LLString& sin)
+LLAssetType::EType LLAssetType::getType(const std::string& sin)
 {
-        LLString s = sin;
+        std::string s = sin;
         LLString::toUpper(s);
         for (S32 idx = 0; ;idx++)
         {
@@ -83,17 +85,17 @@ LLAssetType::EType LLAssetType::getType(const LLString& sin)
         return LLAssetType::AT_NONE;
 }
 
-LLString LLAssetType::getDesc(LLAssetType::EType type)
+std::string LLAssetType::getDesc(LLAssetType::EType type)
 {
         for (S32 idx = 0; ;idx++)
         {
                 asset_info_t* info = asset_types + idx;
                 if (type == info->type)
-                        return LLString(info->desc);
+                        return info->desc;
                 if (info->type == LLAssetType::AT_NONE)
                         break;
         }
-        return LLString("BAD TYPE");
+        return "BAD TYPE";
 }
 
 //============================================================================
@@ -225,7 +227,7 @@ EDragAndDropType LLAssetType::lookupDragAndDropType( EType asset )
 
 // static. Generate a good default description
 void LLAssetType::generateDescriptionFor(LLAssetType::EType type,
-                                                                                 LLString& desc)
+                                                                                 std::string& desc)
 {
         const S32 BUF_SIZE = 30;
         char time_str[BUF_SIZE];        /* Flawfinder: ignore */
diff --git a/linden/indra/llcommon/llassettype.h b/linden/indra/llcommon/llassettype.h
index c62769a..67dc3ef 100644
--- a/linden/indra/llcommon/llassettype.h
+++ b/linden/indra/llcommon/llassettype.h
@@ -28,6 +28,8 @@
 #ifndef LL_LLASSETTYPE
 #define LL_LLASSETTYPE
 
+#include <string>
+
 #include "stdenums.h"   // for EDragAndDropType
 
 class LLAssetType
@@ -150,10 +152,10 @@ public:
         // Generate a good default description. You may want to add a verb
         // or agent name after this depending on your application.
         static void generateDescriptionFor(LLAssetType::EType type,
-                                                                           LLString& desc);
+                                                                           std::string& desc);
 
-        static EType getType(const LLString& sin);
-        static LLString getDesc(EType type);
+        static EType getType(const std::string& sin);
+        static std::string getDesc(EType type);
         
 private:
         // don't instantiate or derive one of these objects
diff --git a/linden/indra/llcommon/llavatarconstants.h b/linden/indra/llcommon/llavatarconstants.h
index f56e9ab..3335949 100644
--- a/linden/indra/llcommon/llavatarconstants.h
+++ b/linden/indra/llcommon/llavatarconstants.h
@@ -39,5 +39,17 @@ const char* const BLACKLIST_PROFILE_WEB_URL = "http://secondlife.com/app/webdisa
 // Maximum number of avatar picks
 const S32 MAX_AVATAR_PICKS = 10;
 
+// For Flags in AvatarPropertiesReply

+const U32 AVATAR_ALLOW_PUBLISH                  = 0x1 << 0;     // whether profile is externally visible or not

+const U32 AVATAR_MATURE_PUBLISH                 = 0x1 << 1;     // profile is "mature"

+const U32 AVATAR_IDENTIFIED                             = 0x1 << 2;     // whether avatar has provided payment info

+const U32 AVATAR_TRANSACTED                             = 0x1 << 3;     // whether avatar has actively used payment info
+const U32 AVATAR_ONLINE                                 = 0x1 << 4; // the online status of this avatar, if known.
+
+static const std::string VISIBILITY_DEFAULT("default");

+static const std::string VISIBILITY_HIDDEN("hidden");
+static const std::string VISIBILITY_VISIBLE("visible");

+static const std::string VISIBILITY_INVISIBLE("invisible");
+
 #endif
 
diff --git a/linden/indra/llcommon/llsdutil.cpp b/linden/indra/llcommon/llsdutil.cpp
index f111039..0f295a1 100644
--- a/linden/indra/llcommon/llsdutil.cpp
+++ b/linden/indra/llcommon/llsdutil.cpp
@@ -222,3 +222,14 @@ U32 ll_ipaddr_from_sd(const LLSD& sd)
         memcpy(&ret, &(v[0]), 4);               /* Flawfinder: ignore */
         return ret;
 }
+
+// Converts an LLSD binary to an LLSD string
+LLSD ll_string_from_binary(const LLSD& sd)
+{
+        std::vector<U8> value = sd.asBinary();
+        char* c_str = new char[value.size() + 1];
+        memcpy(c_str, &value[0], value.size());
+        c_str[value.size()] = '\0';
+
+        return c_str;
+}
diff --git a/linden/indra/llcommon/llsdutil.h b/linden/indra/llcommon/llsdutil.h
index 555d7fb..ca6b76f 100644
--- a/linden/indra/llcommon/llsdutil.h
+++ b/linden/indra/llcommon/llsdutil.h
@@ -70,4 +70,7 @@ U64 ll_U64_from_sd(const LLSD& sd);
 LLSD ll_sd_from_ipaddr(const U32);
 U32 ll_ipaddr_from_sd(const LLSD& sd);
 
+// Binary to string
+LLSD ll_string_from_binary(const LLSD& sd);
+
 #endif // LL_LLSDUTIL_H
diff --git a/linden/indra/llcommon/lluri.cpp b/linden/indra/llcommon/lluri.cpp
index 2eb0f11..e697ec1 100644
--- a/linden/indra/llcommon/lluri.cpp
+++ b/linden/indra/llcommon/lluri.cpp
@@ -28,9 +28,13 @@
  */
 
 #include "linden_common.h"
+
+#include "llapp.h"
 #include "lluri.h"
 #include "llsd.h"
 
+#include "../llmath/lluuid.h"
+
 // uric = reserved | unreserved | escaped
 // reserved = ";" | "/" | "?" | ":" | "@" | "&" | "=" | "+" | "$" | ","
 // unreserved = alphanum | mark
@@ -372,9 +376,21 @@ LLURI LLURI::buildHTTP(const std::string& host_port,
                                            const LLSD& path)
 {
         LLURI result;
-        result.mScheme = "HTTP";
+        
         // TODO: deal with '/' '?' '#' in host_port
-        result.mEscapedAuthority = "//" + escape(host_port);
+        S32 index = host_port.find("://");
+        if (index != host_port.npos)
+        {
+                // The scheme is part of the host_port
+                result.mScheme = "";
+                result.mEscapedAuthority = escape(host_port);
+        }
+        else
+        {
+                result.mScheme = "HTTP";
+                result.mEscapedAuthority = "//" + escape(host_port);
+        }
+
         if (path.isArray())
         {
                 // break out and escape each path component
@@ -416,6 +432,70 @@ LLURI LLURI::buildHTTP(const std::string& host_port,
         return result;
 }
 
+// static
+LLURI LLURI::buildAgentPresenceURI(const LLUUID& agent_id, LLApp* app)
+{
+        std::string host = "localhost:12040";
+
+        if (app)
+        {
+                host = app->getOption("backbone-host-port").asString();
+        }
+
+        LLSD path = LLSD::emptyArray();
+        path.append("agent");
+        path.append(agent_id);
+        path.append("presence");
+
+        return buildHTTP(host, path);
+}
+
+// static
+LLURI LLURI::buildBulkAgentPresenceURI(LLApp* app)
+{
+        std::string host = "localhost:12040";
+
+        if (app)
+        {
+                host = app->getOption("backbone-host-port").asString();
+        }
+
+        LLSD path = LLSD::emptyArray();
+        path.append("agent");
+        path.append("presence");
+
+        return buildHTTP(host, path);
+}
+
+// static
+LLURI LLURI::buildAgentSessionURI(const LLUUID& agent_id, LLApp* app)
+{
+        std::string host = "localhost:12040";
+
+        if (app)
+        {
+                host = app->getOption("backbone-host-port").asString();
+        }
+
+        LLSD path = LLSD::emptyArray();
+        path.append("agent");
+        path.append(agent_id);
+        path.append("session");
+
+        return buildHTTP(host, path);
+}
+
+// static
+LLURI LLURI::buildAgentLoginInfoURI(const LLUUID& agent_id, const std::string& dataserver)
+{
+        LLSD path = LLSD::emptyArray();
+        path.append("agent");
+        path.append(agent_id);
+        path.append("logininfo");
+
+        return buildHTTP(dataserver, path);
+}
+
 std::string LLURI::asString() const
 {
         if (mScheme.empty())
diff --git a/linden/indra/llcommon/lluri.h b/linden/indra/llcommon/lluri.h
index 52f07bf..f69472f 100644
--- a/linden/indra/llcommon/lluri.h
+++ b/linden/indra/llcommon/lluri.h
@@ -33,6 +33,8 @@
 #include <string>
 
 class LLSD;
+class LLUUID;
+class LLApp;
 
 /** 
  *
@@ -80,6 +82,11 @@ public:
         static std::string escape(const std::string& str);
         static std::string unescape(const std::string& str);
 
+        // Functions for building specific URIs for web services
+        static LLURI buildAgentPresenceURI(const LLUUID& agent_id, LLApp* app);
+        static LLURI buildBulkAgentPresenceURI(LLApp* app);
+        static LLURI buildAgentSessionURI(const LLUUID& agent_id, LLApp* app);
+        static LLURI buildAgentLoginInfoURI(const LLUUID& agent_id, const std::string& dataserver);
 private:
         std::string mScheme;
         std::string mEscapedOpaque;
diff --git a/linden/indra/llcommon/llversion.h b/linden/indra/llcommon/llversion.h
index 9cb01a3..af21f72 100644
--- a/linden/indra/llcommon/llversion.h
+++ b/linden/indra/llcommon/llversion.h
@@ -33,8 +33,8 @@
 // MUST ALSO change version number in secondlife setup.nsi
 const S32 LL_VERSION_MAJOR = 1;
 const S32 LL_VERSION_MINOR = 13;
-const S32 LL_VERSION_PATCH = 2;
-const S32 LL_VERSION_BUILD = 15;
+const S32 LL_VERSION_PATCH = 3;
+const S32 LL_VERSION_BUILD = 2;