Second Life viewer sources 1.15.1.3

6 files changed, 74 insertions, 30 deletions

diff --git a/linden/indra/llcommon/llstat.cpp b/linden/indra/llcommon/llstat.cpp
index 4e43923..7e6090f 100644
--- a/linden/indra/llcommon/llstat.cpp
+++ b/linden/indra/llcommon/llstat.cpp
@@ -119,9 +119,9 @@ void LLStatAccum::impl::sum(F64 value, U64 when)
         }
         if (when < mLastTime)
         {
-                // JAMESDEBUG spams on Athlon
-                //llwarns << "LLStatAccum::sum clock has gone backwards from "
-                //      << mLastTime << " to " << when << ", resetting" << llendl;
+                // This happens a LOT on some dual core systems.
+                lldebugs << "LLStatAccum::sum clock has gone backwards from "
+                        << mLastTime << " to " << when << ", resetting" << llendl;
 
                 reset(when);
                 return;
diff --git a/linden/indra/llcommon/llstring.h b/linden/indra/llcommon/llstring.h
index d901e61..8a2c24c 100644
--- a/linden/indra/llcommon/llstring.h
+++ b/linden/indra/llcommon/llstring.h
@@ -1043,7 +1043,7 @@ void LLStringBase<T>::copyInto(std::basic_string<T>& dst, const std::basic_strin
         }
         else
         {
-                LLWString tail = dst.substr(offset);
+                std::basic_string<T> tail = dst.substr(offset);
 
                 dst = dst.substr(0, offset);
                 dst += src;
diff --git a/linden/indra/llcommon/llstringtable.h b/linden/indra/llcommon/llstringtable.h
index 337d937..8d91680 100644
--- a/linden/indra/llcommon/llstringtable.h
+++ b/linden/indra/llcommon/llstringtable.h
@@ -48,12 +48,6 @@
 #include <hash_map>
 #endif
 
-// string_table.h
-// LLStringTable class header file
-// Provides a _fast_ method for finding unique copies of strings
-// 
-// Copyright 2001-2002, Linden Research, Inc.
-
 const U32 MAX_STRINGS_LENGTH = 256;
 
 class LLStringTableEntry
diff --git a/linden/indra/llcommon/lluri.cpp b/linden/indra/llcommon/lluri.cpp
index f85f294..c838b25 100644
--- a/linden/indra/llcommon/lluri.cpp
+++ b/linden/indra/llcommon/lluri.cpp
@@ -114,6 +114,13 @@ namespace
                 { return LLURI::escape(s, unreserved() + ":@!$'()*+,="); }      // sub_delims - "&;" + ":@"
 }
 
+// TODO: USE CURL!! After http textures gets merged everywhere.
+// static
+std::string LLURI::escape(const std::string& str)
+{
+        return escape(str,unreserved()  + ":@!$'()*+,=");
+}
+
 LLURI::LLURI()
 {
 }
@@ -238,24 +245,11 @@ LLURI LLURI::buildHTTP(const std::string& prefix,
                                            const LLSD& path,
                                            const LLSD& query)
 {
-        LLURI result = buildHTTP(prefix, path);
+        LLURI uri = buildHTTP(prefix, path);
+        uri.mEscapedQuery = mapToQueryString(query);
         // break out and escape each query component
-        if (query.isMap())
-        {
-                for (LLSD::map_const_iterator it = query.beginMap();
-                         it != query.endMap();
-                         it++)
-                {
-                        result.mEscapedQuery += escapeQueryVariable(it->first) +
-                                (it->second.isUndefined() ? "" : "=" + escapeQueryValue(it->second.asString())) +
-                                "&";
-                }
-                if (query.size() > 0)
-                {
-                        result.mEscapedOpaque += "?" + result.mEscapedQuery;
-                }
-        }
-        return result;
+        uri.mEscapedOpaque += "?" + uri.mEscapedQuery ;
+        return uri;
 }
 
 // static
@@ -275,7 +269,6 @@ LLURI LLURI::buildHTTP(const std::string& host,
         return LLURI::buildHTTP(llformat("%s:%u", host.c_str(), port), path, query);
 }
 
-
 namespace {
         LLURI buildBackboneURL(LLApp* app,
                                 const std::string& p1 = "",
@@ -317,6 +310,23 @@ LLURI LLURI::buildBulkAgentNamesURI(LLApp* app)
 }
 
 // static
+LLURI LLURI::buildBulkAgentNamesURI(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("names");
+
+        return buildHTTP(host, path);
+}
+
+// static
 LLURI LLURI::buildAgentSessionURI(const LLUUID& agent_id, LLApp* app)
 {
         return buildBackboneURL(app, "agent", agent_id.asString(), "session");
@@ -341,6 +351,24 @@ LLURI LLURI::buildAgentNameURI(const LLUUID& agent_id, LLApp* app)
 }
 
 // static
+LLURI LLURI::buildAgentNameURI(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("name");
+
+        return buildHTTP(host, path);
+}
+
+// static
 LLURI LLURI::buildAgentLoginInfoURI(const LLUUID& agent_id, const std::string& dataserver)
 {
         LLSD path = LLSD::emptyArray();
@@ -492,3 +520,23 @@ LLSD LLURI::queryMap(std::string escaped_query_string)
         return result;
 }
 
+std::string LLURI::mapToQueryString(const LLSD& queryMap)
+{
+        std::string query_string;
+
+        if (queryMap.isMap())
+        {
+                for (LLSD::map_const_iterator iter = queryMap.beginMap();
+                         iter != queryMap.endMap();
+                         iter++)
+                {
+                        query_string += escapeQueryVariable(iter->first) +
+                                (iter->second.isUndefined() ? "" : "=" + escapeQueryValue(iter->second.asString())) + "&" ;
+                }
+                //if (queryMap.size() > 0)
+                //{
+                //      query_string += "?" + query_string ;
+                //}
+        }
+        return query_string;
+}
diff --git a/linden/indra/llcommon/lluri.h b/linden/indra/llcommon/lluri.h
index 77de595..d1499b8 100644
--- a/linden/indra/llcommon/lluri.h
+++ b/linden/indra/llcommon/lluri.h
@@ -90,9 +90,11 @@ public:
   std::string query() const;            // ex.: "x=34", section after "?"
   LLSD queryMap() const;                        // above decoded into a map
   static LLSD queryMap(std::string escaped_query_string);
+  static std::string mapToQueryString(const LLSD& queryMap);
 
   // Escaping Utilities
   // Escape a string by urlencoding all the characters that aren't in the allowed string.
+  static std::string escape(const std::string& str);
   static std::string escape(const std::string& str, const std::string & allowed); 
   static std::string unescape(const std::string& str);
 
diff --git a/linden/indra/llcommon/llversion.h b/linden/indra/llcommon/llversion.h
index 426eff0..a76551d 100644
--- a/linden/indra/llcommon/llversion.h
+++ b/linden/indra/llcommon/llversion.h
@@ -31,7 +31,7 @@
 
 const S32 LL_VERSION_MAJOR = 1;
 const S32 LL_VERSION_MINOR = 15;
-const S32 LL_VERSION_PATCH = 0;
-const S32 LL_VERSION_BUILD = 2;
+const S32 LL_VERSION_PATCH = 1;
+const S32 LL_VERSION_BUILD = 3;
 
 #endif