20 files changed, 157 insertions, 35 deletions

diff --git a/linden/indra/llcommon/llapr.h b/linden/indra/llcommon/llapr.h
index a36b177..e7b12d5 100644
--- a/linden/indra/llcommon/llapr.h
+++ b/linden/indra/llcommon/llapr.h
@@ -35,7 +35,7 @@
 #include <sys/param.h>  // Need PATH_MAX in APR headers...
 #endif
 
-#include "boost/noncopyable.hpp"
+#include <boost/noncopyable.hpp>
 
 #include "apr-1/apr_thread_proc.h"
 #include "apr-1/apr_thread_mutex.h"
diff --git a/linden/indra/llcommon/llavatarconstants.h b/linden/indra/llcommon/llavatarconstants.h
index 3eedf4e..ab49368 100644
--- a/linden/indra/llcommon/llavatarconstants.h
+++ b/linden/indra/llcommon/llavatarconstants.h
@@ -1,5 +1,5 @@
 /** 
- * @file indra_constants.h
+ * @file llavatarconstants.h
  * @brief some useful short term constants for Indra
  *
  * Copyright (c) 2001-2007, Linden Research, Inc.
diff --git a/linden/indra/llcommon/llchat.h b/linden/indra/llcommon/llchat.h
index bb2610b..7339e9a 100644
--- a/linden/indra/llcommon/llchat.h
+++ b/linden/indra/llcommon/llchat.h
@@ -50,7 +50,8 @@ typedef enum e_chat_type
         CHAT_TYPE_START = 4,
         CHAT_TYPE_STOP = 5,
         CHAT_TYPE_DEBUG_MSG = 6,
-        CHAT_TYPE_REGION = 7
+        CHAT_TYPE_REGION = 7,
+        CHAT_TYPE_OWNER = 8
 } EChatType;
 
 typedef enum e_chat_audible_level
diff --git a/linden/indra/llcommon/lldefs.h b/linden/indra/llcommon/lldefs.h
index a3651ff..25f4e73 100644
--- a/linden/indra/llcommon/lldefs.h
+++ b/linden/indra/llcommon/lldefs.h
@@ -55,13 +55,15 @@ const U32	SOUTHWEST	= 6;
 const U32       SOUTHEAST       = 7;
 const U32       MIDDLE          = 8;
 
-const U8 LL_SOUND_FLAG_NONE = 0x00;
-const U8 LL_SOUND_FLAG_LOOP = 0x01;
-const U8 LL_SOUND_FLAG_SYNC_MASTER = 0x02;
-const U8 LL_SOUND_FLAG_SYNC_SLAVE = 0x04;
-const U8 LL_SOUND_FLAG_SYNC_PENDING = 0x08;
-const U8 LL_SOUND_FLAG_SYNC_MASK = LL_SOUND_FLAG_SYNC_MASTER | LL_SOUND_FLAG_SYNC_SLAVE | LL_SOUND_FLAG_SYNC_PENDING;
-const U8 LL_SOUND_FLAG_QUEUE = 0x10;
+const U8        EAST_MASK               = 0x1<<EAST;
+const U8        NORTH_MASK              = 0x1<<NORTH;
+const U8        WEST_MASK               = 0x1<<WEST;
+const U8        SOUTH_MASK              = 0x1<<SOUTH;
+
+const U8        NORTHEAST_MASK  = NORTH_MASK | EAST_MASK;
+const U8        NORTHWEST_MASK  = NORTH_MASK | WEST_MASK;
+const U8        SOUTHWEST_MASK  = SOUTH_MASK | WEST_MASK;
+const U8        SOUTHEAST_MASK  = SOUTH_MASK | EAST_MASK;
 
 const U32 gDirOpposite[8] = {2, 3, 0, 1, 6, 7, 4, 5};
 const U32 gDirAdjacent[8][2] =  {
@@ -87,15 +89,6 @@ const S32 gDirAxes[8][2] = {
                                                         { 1,-1}, // se
                                                         };
 
-const U8        EAST_MASK               = 1;
-const U8        NORTH_MASK              = 2;
-const U8        WEST_MASK               = 4;
-const U8        SOUTH_MASK              = 8;
-const U8        NORTHEAST_MASK  = NORTH_MASK | EAST_MASK;
-const U8        NORTHWEST_MASK  = NORTH_MASK | WEST_MASK;
-const U8        SOUTHWEST_MASK  = SOUTH_MASK | WEST_MASK;
-const U8        SOUTHEAST_MASK  = SOUTH_MASK | EAST_MASK;
-
 const S32 gDirMasks[8] = { 
                                                         EAST_MASK,
                                                         NORTH_MASK,
@@ -133,6 +126,14 @@ const U32 RIGHT_SIDE 	= 4;
 const U32 TOP_SIDE              = 5;
 const U32 BOTTOM_SIDE   = 6;
 
+const U8 LL_SOUND_FLAG_NONE =         0x0;
+const U8 LL_SOUND_FLAG_LOOP =         1<<0;
+const U8 LL_SOUND_FLAG_SYNC_MASTER =  1<<1;
+const U8 LL_SOUND_FLAG_SYNC_SLAVE =   1<<2;
+const U8 LL_SOUND_FLAG_SYNC_PENDING = 1<<3;
+const U8 LL_SOUND_FLAG_QUEUE =        1<<4;
+const U8 LL_SOUND_FLAG_STOP =         1<<5;
+const U8 LL_SOUND_FLAG_SYNC_MASK = LL_SOUND_FLAG_SYNC_MASTER | LL_SOUND_FLAG_SYNC_SLAVE | LL_SOUND_FLAG_SYNC_PENDING;
 
 //
 // *NOTE: These values may be used as hard-coded numbers in scanf() variants.
diff --git a/linden/indra/llcommon/llfile.cpp b/linden/indra/llcommon/llfile.cpp
index 4520fd1..6fcfc42 100644
--- a/linden/indra/llcommon/llfile.cpp
+++ b/linden/indra/llcommon/llfile.cpp
@@ -29,6 +29,7 @@
  * COMPLETENESS OR PERFORMANCE.
  */
 
+#include "linden_common.h"
 #include "llfile.h"
 #include "llstring.h"
 #include "llerror.h"
diff --git a/linden/indra/llcommon/llmortician.cpp b/linden/indra/llcommon/llmortician.cpp
index ec1383f..be362bf 100644
--- a/linden/indra/llcommon/llmortician.cpp
+++ b/linden/indra/llcommon/llmortician.cpp
@@ -25,6 +25,7 @@
  * COMPLETENESS OR PERFORMANCE.
  */
 
+#include "linden_common.h"
 #include "llmortician.h"
 
 #include <list>
diff --git a/linden/indra/llcommon/llprocessor.cpp b/linden/indra/llcommon/llprocessor.cpp
index 40dc00c..bd21351 100644
--- a/linden/indra/llcommon/llprocessor.cpp
+++ b/linden/indra/llcommon/llprocessor.cpp
@@ -453,7 +453,7 @@ bool CProcessor::AnalyzeIntelProcessor()
                                                 case 3:                 // Model = 8, Brand id = 3:  Pentium III Xeon (on-die L2 cache) processor model
                                                 strncat(strCPUName, "Intel Pentium III Xeon (0.18 micron process) with internal L2 cache", sizeof(strCPUName)-(strlen(strCPUName)-1)); /*Flawfinder: ignore*/
                                                         break;
-                                                default:                // ...²
+                                                default:                // ...
                                                         strncat(strCPUName, "Intel Pentium III core (unknown model, 0.18 micron process) with internal L2 cache", sizeof(strCPUName)-(strlen(strCPUName)-1)); /*Flawfinder: ignore*/
                                                         break;
                                         }
@@ -664,8 +664,8 @@ bool CProcessor::AnalyzeAMDProcessor()
                         mov dword ptr [tmp+44], edx
                 }
                 // And copy it to the brand id string
-                strncpy(CPUInfo.strBrandID, tmp,sizeof(CPUInfo.strBrandID-1));  /* Flawfinder: ignore */                
-                CPUInfo.strBrandID[sizeof(CPUInfo.strBrandID-1)]='\0';
+                strncpy(CPUInfo.strBrandID, tmp,sizeof(CPUInfo.strBrandID)-1);
+                CPUInfo.strBrandID[sizeof(CPUInfo.strBrandID)-1]='\0';
         }
         else
         {
@@ -1280,17 +1280,17 @@ void CProcessor::DecodeProcessorConfiguration(unsigned int cfg)
                         CPUInfo._L1.Data.uiAssociativeWays = 4;
                         CPUInfo._L1.Data.uiLineSize = 64;
                         break;
-                case 0x70:              // cfg = 0x70:  trace L1 cache present, 12 KµOPs, 4 ways
+                case 0x70:              // cfg = 0x70:  trace L1 cache present, 12 KuOPs, 4 ways
                         CPUInfo._Trace.bPresent = true;
                         strcpy(CPUInfo._Trace.strSize, "12 K-micro-ops");       /* Flawfinder: ignore */
                         CPUInfo._Trace.uiAssociativeWays = 4;
                         break;
-                case 0x71:              // cfg = 0x71:  trace L1 cache present, 16 KµOPs, 4 ways
+                case 0x71:              // cfg = 0x71:  trace L1 cache present, 16 KuOPs, 4 ways
                         CPUInfo._Trace.bPresent = true;
                         strcpy(CPUInfo._Trace.strSize, "16 K-micro-ops");       /* Flawfinder: ignore */
                         CPUInfo._Trace.uiAssociativeWays = 4;
                         break;
-                case 0x72:              // cfg = 0x72:  trace L1 cache present, 32 KµOPs, 4 ways
+                case 0x72:              // cfg = 0x72:  trace L1 cache present, 32 KuOPs, 4 ways
                         CPUInfo._Trace.bPresent = true;
                         strcpy(CPUInfo._Trace.strSize, "32 K-micro-ops");       /* Flawfinder: ignore */
                         CPUInfo._Trace.uiAssociativeWays = 4;
diff --git a/linden/indra/llcommon/llsd.cpp b/linden/indra/llcommon/llsd.cpp
index 376a0de..f6d8d0e 100644
--- a/linden/indra/llcommon/llsd.cpp
+++ b/linden/indra/llcommon/llsd.cpp
@@ -26,6 +26,7 @@
  * COMPLETENESS OR PERFORMANCE.
  */
 
+#include "linden_common.h"
 #include "llsd.h"
 
 #include <sstream>
diff --git a/linden/indra/llcommon/llsdserialize_xml.cpp b/linden/indra/llcommon/llsdserialize_xml.cpp
index 04cdd57..85d3883 100644
--- a/linden/indra/llcommon/llsdserialize_xml.cpp
+++ b/linden/indra/llcommon/llsdserialize_xml.cpp
@@ -398,7 +398,10 @@ S32 LLSDXMLParser::Impl::parse(std::istream& input, LLSD& data)
         status = XML_ParseBuffer(mParser, 0, true);
         if (status == XML_STATUS_ERROR && !mGracefullStop)
         {
-                ((char*) buffer)[count? count - 1 : 0] = '\0';
+                if (buffer)
+                {
+                        ((char*) buffer)[count ? count - 1 : 0] = '\0';
+                }
                 llinfos << "LLSDXMLParser::Impl::parse: XML_STATUS_ERROR parsing:" << (char*) buffer << llendl;
                 data = LLSD();
                 return -1;
diff --git a/linden/indra/llcommon/llsdutil.cpp b/linden/indra/llcommon/llsdutil.cpp
index 85718ba..e8b3ac5 100644
--- a/linden/indra/llcommon/llsdutil.cpp
+++ b/linden/indra/llcommon/llsdutil.cpp
@@ -297,4 +297,4 @@ char* ll_pretty_print_sd(const LLSD& sd)
         strncpy(buffer, stream.str().c_str(), bufferSize);
         buffer[bufferSize - 1] = '\0';
         return buffer;
-}
\ No newline at end of file
+}
diff --git a/linden/indra/llcommon/llstreamtools.cpp b/linden/indra/llcommon/llstreamtools.cpp
index d70fa60..e6cd909 100644
--- a/linden/indra/llcommon/llstreamtools.cpp
+++ b/linden/indra/llcommon/llstreamtools.cpp
@@ -26,6 +26,8 @@
  * COMPLETENESS OR PERFORMANCE.
  */
 
+#include "linden_common.h"
+
 #include <iostream>
 #include <string>
 
diff --git a/linden/indra/llcommon/llstring.cpp b/linden/indra/llcommon/llstring.cpp
index 22d7b47..b5e307f 100644
--- a/linden/indra/llcommon/llstring.cpp
+++ b/linden/indra/llcommon/llstring.cpp
@@ -673,6 +673,26 @@ std::string mbcsstring_makeASCII(const std::string& wstr)
         }
         return out_str;
 }
+std::string utf8str_removeCRLF(const std::string& utf8str)
+{
+        if (0 == utf8str.length())
+        {
+                return std::string();
+        }
+        const char CR = 13;
+
+        std::string out;
+        out.reserve(utf8str.length());
+        const S32 len = (S32)utf8str.length();
+        for( S32 i = 0; i < len; i++ )
+        {
+                if( utf8str[i] != CR )
+                {
+                        out.push_back(utf8str[i]);
+                }
+        }
+        return out;
+}
 
 #if LL_WINDOWS
 /* If the size of the passed in buffer is not large enough to hold the string,
diff --git a/linden/indra/llcommon/llstring.h b/linden/indra/llcommon/llstring.h
index 8a2c24c..a24f944 100644
--- a/linden/indra/llcommon/llstring.h
+++ b/linden/indra/llcommon/llstring.h
@@ -457,6 +457,9 @@ std::string utf8str_makeASCII(const std::string& utf8str);
 // Hack - used for evil notecards.
 std::string mbcsstring_makeASCII(const std::string& str); 
 
+std::string utf8str_removeCRLF(const std::string& utf8str);
+
+
 template <class T>
 std::ostream& operator<<(std::ostream &s, const LLStringBase<T> &str)
 {
diff --git a/linden/indra/llcommon/lluri.cpp b/linden/indra/llcommon/lluri.cpp
index c838b25..83de022 100644
--- a/linden/indra/llcommon/lluri.cpp
+++ b/linden/indra/llcommon/lluri.cpp
@@ -188,6 +188,55 @@ LLURI::LLURI(const std::string& escaped_str)
         }
 }
 
+static BOOL isDefault(const std::string& scheme, U16 port)
+{
+        if (scheme == "http")
+                return port == 80;
+        if (scheme == "https")
+                return port == 443;
+        if (scheme == "ftp")
+                return port == 21;
+
+        return FALSE;
+}
+
+LLURI::LLURI(const std::string& scheme,
+                         const std::string& userName,
+                         const std::string& password,
+                         const std::string& hostName,
+                         U16 port,
+                         const std::string& escapedPath,
+                         const std::string& escapedQuery)
+        : mScheme(scheme),
+          mEscapedPath(escapedPath),
+          mEscapedQuery(escapedQuery)
+{
+        std::ostringstream auth;
+        std::ostringstream opaque;
+
+        opaque << "//";
+        
+        if (!userName.empty())
+        {
+                auth << escape(userName);
+                if (!password.empty())
+                {
+                        auth << ':' << escape(password);
+                }
+                auth << '@';
+        }
+        auth << hostName;
+        if (!isDefault(scheme, port))
+        {
+                auth << ':' << port;
+        }
+        mEscapedAuthority = auth.str();
+
+        opaque << mEscapedAuthority << escapedPath << escapedQuery;
+
+        mEscapedOpaque = opaque.str();
+}
+
 LLURI::~LLURI()
 {
 }
@@ -447,6 +496,35 @@ std::string LLURI::hostName() const
         return unescape(host);
 }
 
+std::string LLURI::userName() const
+{
+        std::string user, userPass, host, port;
+        findAuthorityParts(mEscapedAuthority, userPass, host, port);
+        std::string::size_type pos = userPass.find(':');
+        if (pos != std::string::npos)
+        {
+                user = userPass.substr(0, pos);
+        }
+        return unescape(user);
+}
+
+std::string LLURI::password() const
+{
+        std::string pass, userPass, host, port;
+        findAuthorityParts(mEscapedAuthority, userPass, host, port);
+        std::string::size_type pos = userPass.find(':');
+        if (pos != std::string::npos)
+        {
+                pass = userPass.substr(pos + 1);
+        }
+        return unescape(pass);
+}
+
+BOOL LLURI::defaultPort() const
+{
+        return isDefault(mScheme, hostPort());
+}
+
 U16 LLURI::hostPort() const
 {
         std::string user, host, port;
diff --git a/linden/indra/llcommon/lluri.h b/linden/indra/llcommon/lluri.h
index d1499b8..3f24799 100644
--- a/linden/indra/llcommon/lluri.h
+++ b/linden/indra/llcommon/lluri.h
@@ -48,6 +48,14 @@ class LLURI
 public:
   LLURI();
   LLURI(const std::string& escaped_str);
+  LLURI(const std::string& scheme,
+                const std::string& userName,
+                const std::string& password,
+                const std::string& hostName,
+                U16 hostPort,
+                const std::string& escapedPath,
+                const std::string& escapedQuery);
+          
   // construct from escaped string, as would be transmitted on the net
 
   ~LLURI();
@@ -68,8 +76,6 @@ public:
                          const U32& port,
                          const LLSD& path,
                          const LLSD& query);
-                         
-          
   std::string asString() const;
   // the whole URI, escaped as needed
   
@@ -84,10 +90,15 @@ public:
   // for schemes that follow path like syntax (http, https, ftp)
   std::string authority() const;        // ex.: "host.com:80"
   std::string hostName() const; // ex.: "host.com"
+  std::string userName() const;
+  std::string password() const;
   U16 hostPort() const;                 // ex.: 80, will include implicit port
+  BOOL defaultPort() const;             // true if port is default for scheme
+  const std::string& escapedPath() const { return mEscapedPath; }
   std::string path() const;             // ex.: "/abc/def", includes leading slash
   //    LLSD pathArray() const;                 // above decoded into an array of strings
   std::string query() const;            // ex.: "x=34", section after "?"
+  const std::string& escapedQuery() const { return mEscapedQuery; }
   LLSD queryMap() const;                        // above decoded into a map
   static LLSD queryMap(std::string escaped_query_string);
   static std::string mapToQueryString(const LLSD& queryMap);
diff --git a/linden/indra/llcommon/llversion.h b/linden/indra/llcommon/llversion.h
index 57b1512..2623c3a 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 = 17;
-const S32 LL_VERSION_PATCH = 0;
-const S32 LL_VERSION_BUILD = 12;
+const S32 LL_VERSION_PATCH = 1;
+const S32 LL_VERSION_BUILD = 0;
 
 #endif
diff --git a/linden/indra/llcommon/processor.h b/linden/indra/llcommon/processor.h
index 367d540..34d970e 100644
--- a/linden/indra/llcommon/processor.h
+++ b/linden/indra/llcommon/processor.h
@@ -2,7 +2,7 @@
  * @file processor.h
  * @brief Legacy wrapper header.
  *
- * Copyright (c) 2000-2007 Linden Research, Inc.
+ * Copyright (c) 2000-2007, Linden Research, Inc.
  * 
  * Second Life Viewer Source Code
  * The source code in this file ("Source Code") is provided by Linden Lab
diff --git a/linden/indra/llcommon/string_table.h b/linden/indra/llcommon/string_table.h
index 790741d..3d30c9f 100644
--- a/linden/indra/llcommon/string_table.h
+++ b/linden/indra/llcommon/string_table.h
@@ -2,7 +2,7 @@
  * @file string_table.h
  * @brief Legacy wrapper header.
  *
- * Copyright (c) 2000-2007 Linden Research, Inc.
+ * Copyright (c) 2000-2007, Linden Research, Inc.
  * 
  * Second Life Viewer Source Code
  * The source code in this file ("Source Code") is provided by Linden Lab
diff --git a/linden/indra/llcommon/timer.h b/linden/indra/llcommon/timer.h
index 31e6db6..3a098ec 100644
--- a/linden/indra/llcommon/timer.h
+++ b/linden/indra/llcommon/timer.h
@@ -2,7 +2,7 @@
  * @file timer.h
  * @brief Legacy wrapper header.
  *
- * Copyright (c) 2000-2007 Linden Research, Inc.
+ * Copyright (c) 2000-2007, Linden Research, Inc.
  * 
  * Second Life Viewer Source Code
  * The source code in this file ("Source Code") is provided by Linden Lab
diff --git a/linden/indra/llcommon/timing.cpp b/linden/indra/llcommon/timing.cpp
index 342bf19..0737beb 100644
--- a/linden/indra/llcommon/timing.cpp
+++ b/linden/indra/llcommon/timing.cpp
@@ -2,7 +2,7 @@
  * @file timing.cpp
  * @brief This file will be deprecated in the future.
  *
- * Copyright (c) 2000-2007 Linden Research, Inc.
+ * Copyright (c) 2000-2007, Linden Research, Inc.
  * 
  * Second Life Viewer Source Code
  * The source code in this file ("Source Code") is provided by Linden Lab