svn merge -r 60342:61148 svn+ssh://svn/svn/linden/branches/maintenance into release

4 files changed, 11 insertions, 9 deletions

diff --git a/indra/llcommon/llstat.cpp b/indra/llcommon/llstat.cpp
index 3d9cbaf64f..446c33bf02 100644
--- a/indra/llcommon/llstat.cpp
+++ b/indra/llcommon/llstat.cpp
@@ -99,9 +99,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/indra/llcommon/llstringtable.h b/indra/llcommon/llstringtable.h
index f293045119..226df74f5d 100644
--- a/indra/llcommon/llstringtable.h
+++ b/indra/llcommon/llstringtable.h
@@ -28,12 +28,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/indra/llcommon/lluri.cpp b/indra/llcommon/lluri.cpp
index ee14028ec9..fc29e760be 100644
--- a/indra/llcommon/lluri.cpp
+++ b/indra/llcommon/lluri.cpp
@@ -94,6 +94,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()
 {
 }
diff --git a/indra/llcommon/lluri.h b/indra/llcommon/lluri.h
index 78ffcf0a87..0665255676 100644
--- a/indra/llcommon/lluri.h
+++ b/indra/llcommon/lluri.h
@@ -74,6 +74,7 @@ public:
 
   // 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);