svn merge -r 58902:58986 svn+ssh://svn.lindenlab.com/svn/linden/branches/maintenance --> release

8 files changed, 150 insertions, 150 deletions

diff --git a/indra/llcommon/llavatarconstants.h b/indra/llcommon/llavatarconstants.h
index 67bd329732..d66627c4b0 100644
--- a/indra/llcommon/llavatarconstants.h
+++ b/indra/llcommon/llavatarconstants.h
@@ -20,16 +20,16 @@ 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

+// 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_DEFAULT("default");
 static const std::string VISIBILITY_HIDDEN("hidden");
-static const std::string VISIBILITY_VISIBLE("visible");

+static const std::string VISIBILITY_VISIBLE("visible");
 static const std::string VISIBILITY_INVISIBLE("invisible");
 
 #endif
diff --git a/indra/llcommon/llbase64.cpp b/indra/llcommon/llbase64.cpp
index 88e9d960a2..6c4bc59e68 100644
--- a/indra/llcommon/llbase64.cpp
+++ b/indra/llcommon/llbase64.cpp
@@ -1,43 +1,43 @@
-/** 

- * @file llbase64.cpp

- * @brief Wrapper for apr base64 encoding that returns a std::string

- * @author James Cook

- *

- * Copyright (c) 2007-$CurrentYear$, Linden Research, Inc.

- * $License$

- */

-

-#include "linden_common.h"

-

-#include "llbase64.h"

-

-#include <string>

-

-#include "apr-1/apr_base64.h"

-

-

-// static

-std::string LLBase64::encode(const U8* input, size_t input_size)

-{

-	std::string output;

-	if (input

-		&& input_size > 0)

-	{

-		// Yes, it returns int.

-		int b64_buffer_length = apr_base64_encode_len(input_size);

-		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_encode_binary(

-			b64_buffer,

-			input,

-			input_size);

-		output.assign(b64_buffer);

-		delete[] b64_buffer;

-	}

-	return output;

-}

-

+/** 
+ * @file llbase64.cpp
+ * @brief Wrapper for apr base64 encoding that returns a std::string
+ * @author James Cook
+ *
+ * Copyright (c) 2007-$CurrentYear$, Linden Research, Inc.
+ * $License$
+ */
+
+#include "linden_common.h"
+
+#include "llbase64.h"
+
+#include <string>
+
+#include "apr-1/apr_base64.h"
+
+
+// static
+std::string LLBase64::encode(const U8* input, size_t input_size)
+{
+	std::string output;
+	if (input
+		&& input_size > 0)
+	{
+		// Yes, it returns int.
+		int b64_buffer_length = apr_base64_encode_len(input_size);
+		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_encode_binary(
+			b64_buffer,
+			input,
+			input_size);
+		output.assign(b64_buffer);
+		delete[] b64_buffer;
+	}
+	return output;
+}
+
diff --git a/indra/llcommon/llbase64.h b/indra/llcommon/llbase64.h
index 6e8b817ba7..4f59ceded6 100644
--- a/indra/llcommon/llbase64.h
+++ b/indra/llcommon/llbase64.h
@@ -1,19 +1,19 @@
-/** 

- * @file llbase64.h

- * @brief Wrapper for apr base64 encoding that returns a std::string

- * @author James Cook

- *

- * Copyright (c) 2007-$CurrentYear$, Linden Research, Inc.

- * $License$

- */

-

-#ifndef LLBASE64_H

-#define LLBASE64_h

-

-class LLBase64

-{

-public:

-	static std::string encode(const U8* input, size_t input_size);

-};

-

-#endif

+/** 
+ * @file llbase64.h
+ * @brief Wrapper for apr base64 encoding that returns a std::string
+ * @author James Cook
+ *
+ * Copyright (c) 2007-$CurrentYear$, Linden Research, Inc.
+ * $License$
+ */
+
+#ifndef LLBASE64_H
+#define LLBASE64_h
+
+class LLBase64
+{
+public:
+	static std::string encode(const U8* input, size_t input_size);
+};
+
+#endif
diff --git a/indra/llcommon/llfasttimer.h b/indra/llcommon/llfasttimer.h
index 16af098ed5..3e88784d3c 100644
--- a/indra/llcommon/llfasttimer.h
+++ b/indra/llcommon/llfasttimer.h
@@ -25,6 +25,7 @@ public:
 		FTM_UPDATE,
 		FTM_RENDER,
 		FTM_SWAP,
+		FTM_CLIENT_COPY,
 		FTM_IDLE,
 		FTM_SLEEP,
 
diff --git a/indra/llcommon/llliveappconfig.cpp b/indra/llcommon/llliveappconfig.cpp
index 8bcaeb898f..b446c1f18e 100644
--- a/indra/llcommon/llliveappconfig.cpp
+++ b/indra/llcommon/llliveappconfig.cpp
@@ -1,46 +1,46 @@
-/** 

- * @file llliveappconfig.cpp

- * @brief Configuration information for an LLApp that overrides indra.xml

- *

- * Copyright (c) 2003-$CurrentYear$, Linden Research, Inc.

- * $License$

- */

-

-#include "linden_common.h"

-

-#include "llliveappconfig.h"

-

-#include "llapp.h"

-#include "llsd.h"

-#include "llsdserialize.h"

-

-LLLiveAppConfig::LLLiveAppConfig(LLApp* app, const std::string& filename, F32 refresh_period)

-:	LLLiveFile(filename, refresh_period),

-	mApp(app)

-{ }

-

-

-LLLiveAppConfig::~LLLiveAppConfig()

-{ }

-

-// virtual 

-void LLLiveAppConfig::loadFile()

-{

-	llinfos << "LLLiveAppConfig::loadFile(): reading from "

-		<< filename() << llendl;

-    llifstream file(filename().c_str());

-	LLSD config;

-    if (file.is_open())

-    {

-        LLSDSerialize::fromXML(config, file);

-		if(!config.isMap())

-		{

-			llinfos << "LLDataserverConfig::loadFile(): not an map!"

-				<< " Ignoring the data." << llendl;

-			return;

-		}

-		file.close();

-    }

-	mApp->setOptionData(

-		LLApp::PRIORITY_SPECIFIC_CONFIGURATION, config);

-}

+/** 
+ * @file llliveappconfig.cpp
+ * @brief Configuration information for an LLApp that overrides indra.xml
+ *
+ * Copyright (c) 2003-$CurrentYear$, Linden Research, Inc.
+ * $License$
+ */
+
+#include "linden_common.h"
+
+#include "llliveappconfig.h"
+
+#include "llapp.h"
+#include "llsd.h"
+#include "llsdserialize.h"
+
+LLLiveAppConfig::LLLiveAppConfig(LLApp* app, const std::string& filename, F32 refresh_period)
+:	LLLiveFile(filename, refresh_period),
+	mApp(app)
+{ }
+
+
+LLLiveAppConfig::~LLLiveAppConfig()
+{ }
+
+// virtual 
+void LLLiveAppConfig::loadFile()
+{
+	llinfos << "LLLiveAppConfig::loadFile(): reading from "
+		<< filename() << llendl;
+    llifstream file(filename().c_str());
+	LLSD config;
+    if (file.is_open())
+    {
+        LLSDSerialize::fromXML(config, file);
+		if(!config.isMap())
+		{
+			llinfos << "LLDataserverConfig::loadFile(): not an map!"
+				<< " Ignoring the data." << llendl;
+			return;
+		}
+		file.close();
+    }
+	mApp->setOptionData(
+		LLApp::PRIORITY_SPECIFIC_CONFIGURATION, config);
+}
diff --git a/indra/llcommon/llliveappconfig.h b/indra/llcommon/llliveappconfig.h
index ceceda5b18..8875f3adc3 100644
--- a/indra/llcommon/llliveappconfig.h
+++ b/indra/llcommon/llliveappconfig.h
@@ -1,33 +1,33 @@
-/** 

- * @file llliveappconfig.h

- * @brief Configuration information for an LLApp that overrides indra.xml

- *

- * Copyright (c) 2003-$CurrentYear$, Linden Research, Inc.

- * $License$

- */

-

-#ifndef LLLIVEAPPCONFIG_H

-#define LLLIVEAPPCONFIG_H

-

-#include "lllivefile.h"

-

-class LLApp;

-

-class LLLiveAppConfig : public LLLiveFile

-{

-public:

-	// To use this, instantiate a LLLiveAppConfig object inside your main loop.

-	// The traditional name for it is live_config.

-	// Be sure to call live_config.checkAndReload() periodically.

-

-	LLLiveAppConfig(LLApp* app, const std::string& filename, F32 refresh_period);

-	~LLLiveAppConfig();

-

-protected:

-	/*virtual*/ void loadFile();

-

-private:

-	LLApp* mApp;

-};

-

-#endif

+/** 
+ * @file llliveappconfig.h
+ * @brief Configuration information for an LLApp that overrides indra.xml
+ *
+ * Copyright (c) 2003-$CurrentYear$, Linden Research, Inc.
+ * $License$
+ */
+
+#ifndef LLLIVEAPPCONFIG_H
+#define LLLIVEAPPCONFIG_H
+
+#include "lllivefile.h"
+
+class LLApp;
+
+class LLLiveAppConfig : public LLLiveFile
+{
+public:
+	// To use this, instantiate a LLLiveAppConfig object inside your main loop.
+	// The traditional name for it is live_config.
+	// Be sure to call live_config.checkAndReload() periodically.
+
+	LLLiveAppConfig(LLApp* app, const std::string& filename, F32 refresh_period);
+	~LLLiveAppConfig();
+
+protected:
+	/*virtual*/ void loadFile();
+
+private:
+	LLApp* mApp;
+};
+
+#endif
diff --git a/indra/llcommon/lluri.cpp b/indra/llcommon/lluri.cpp
index cf06fe3f40..1f64c3bde3 100644
--- a/indra/llcommon/lluri.cpp
+++ b/indra/llcommon/lluri.cpp
@@ -359,8 +359,7 @@ LLURI LLURI::buildHTTP(const std::string& host_port,
 	LLURI result;
 	
 	// TODO: deal with '/' '?' '#' in host_port
-	S32 index = host_port.find("://");
-	if (index != host_port.npos)
+	if (host_port.find("://") != host_port.npos)
 	{
 		// The scheme is part of the host_port
 		result.mScheme = "";
diff --git a/indra/llcommon/metaproperty.cpp b/indra/llcommon/metaproperty.cpp
index befee61a8a..adcda03389 100644
--- a/indra/llcommon/metaproperty.cpp
+++ b/indra/llcommon/metaproperty.cpp
@@ -25,7 +25,7 @@ const LLMetaClass& LLMetaProperty::getObjectMetaClass() const
 {
 	return mObjectClass;
 }
-

+
 void LLMetaProperty::checkObjectClass(const LLReflective* object) const
 {
 	if(! mObjectClass.isInstance(object))