Merge branch 'master' of git://github.com/siana/SingularityViewer.git

indra/cmake/00-Common.cmake

@@ -164,6 +164,11 @@ if (LINUX)
     add_definitions(-Wno-parentheses)
   endif (${CXX_VERSION} GREATER 429)
 
+  #gcc 4.6 has a new spammy warning
+  if(NOT ${CXX_VERSION} LESS 460)
+    add_definitions(-Wno-unused-but-set-variable)
+  endif (NOT ${CXX_VERSION} LESS 460)
+
   # End of hacks.
 
   add_definitions(

indra/cmake/GooglePerfTools.cmake

@@ -21,7 +21,6 @@ else (STANDALONE)
     endif()
     set(GOOGLE_PERFTOOLS_INCLUDE_DIR
         ${LIBS_PREBUILT_DIR}/${LL_ARCH_DIR}/include)
-    set(GOOGLE_PERFTOOLS_FOUND "YES")
   endif (LINUX)
 endif (STANDALONE)
 

indra/llaudio/llaudioengine.h

@@ -478,7 +478,7 @@ protected:
 extern LLAudioEngine* gAudiop;
 
 // <edit>
-typedef struct
+struct LLSoundHistoryItem
 {
 	LLUUID mID;
 	LLVector3d mPosition;
@@ -494,7 +494,11 @@ typedef struct
 	bool mReviewed;
 	bool mReviewedCollision;
 	LLAudioSource* mAudioSource;
-} LLSoundHistoryItem;
+	
+	LLSoundHistoryItem() : mType(0), mPlaying(false), mIsTrigger(false),
+			mIsLooped(false), mReviewed(false), mReviewedCollision(false),
+			mTimeStarted(0), mTimeStopped(0), mAudioSource(0) {}
+};
 
 extern std::map<LLUUID, LLSoundHistoryItem> gSoundHistory;
 

indra/llcommon/aithreadsafe.h

@@ -278,7 +278,11 @@ struct AIReadAccessConst
 protected:
 	//! Constructor used by AIReadAccess.
 	AIReadAccessConst(AIThreadSafe<T>& wrapper, state_type state)
-		: mWrapper(wrapper), mState(state) { }
+		: mWrapper(wrapper), mState(state) 
+#if AI_NEED_ACCESS_CC
+		  ,	mIsCopyConstructed(false)
+#endif
+	{ }
 
 	AIThreadSafe<T>& mWrapper;	//!< Reference to the object that we provide access to.
 	state_type const mState;	//!< The lock state that mWrapper is in.

indra/llcommon/llsdserialize.cpp

@@ -1447,9 +1447,12 @@ S32 LLSDBinaryFormatter::format(const LLSD& data, std::ostream& ostr, U32 option
 	}
 
 	case LLSD::TypeUUID:
+	{
 		ostr.put('u');
-		ostr.write((const char*)(&(data.asUUID().mData)), UUID_BYTES);
+		LLUUID d = data.asUUID();
+		ostr.write((const char*)(&(d.mData)), UUID_BYTES);
 		break;
+	}
 
 	case LLSD::TypeString:
 		ostr.put('s');

indra/llcommon/llthread.h

@@ -179,6 +179,10 @@ public:
 
 protected:
 	AIAPRPool mPool;
+private:
+	// Disable copy construction, as si teh bomb!!! -SG
+	LLMutex(const LLMutex&);
+	LLMutex& operator=(const LLMutex&);
 };
 
 #if APR_HAS_THREADS

indra/llcommon/llversionviewer.h

@@ -36,7 +36,7 @@
 const S32 LL_VERSION_MAJOR = 1;
 const S32 LL_VERSION_MINOR = 5;
 const S32 LL_VERSION_PATCH = 8;
-const S32 LL_VERSION_BUILD = 0;
+const S32 LL_VERSION_BUILD = 1;
 
 const char * const LL_CHANNEL = "Singularity";
 

indra/llinventory/llparcel.cpp

@@ -605,13 +605,13 @@ BOOL LLParcel::importAccessEntry(std::istream& input_stream, LLAccessEntry* entr
         }
         else if ("time" == keyword)
         {
-            S32 when;
+            S32 when = -1;
             LLStringUtil::convertToS32(value, when);
             entry->mTime = when;
         }
         else if ("flags" == keyword)
         {
-            U32 setting;
+            U32 setting = 0xFFFFFFFF;
             LLStringUtil::convertToU32(value, setting);
             entry->mFlags = setting;
         }

indra/llui/llfunctorregistry.h

@@ -75,7 +75,6 @@ public:
 	bool registerFunctor(const std::string& name, ResponseFunctor f)
 	{
 		bool retval = true;
-		typename FunctorMap::iterator it = mMap.find(name);
 		if (mMap.count(name) == 0)
 		{
 			mMap[name] = f;
@@ -102,7 +101,6 @@ public:
 
 	FUNCTOR_TYPE getFunctor(const std::string& name)
 	{
-		typename FunctorMap::iterator it = mMap.find(name);
 		if (mMap.count(name) != 0)
 		{
 			return mMap[name];

indra/newview/llpanellogin.cpp

@@ -911,8 +911,10 @@ void LLPanelLogin::loadLoginPage()
 	std::string version = llformat("%d.%d.%d (%d)",
 						LL_VERSION_MAJOR, LL_VERSION_MINOR, LL_VERSION_PATCH, LL_VERSION_BUILD);
 
-	oStr << "&channel=" << LLWeb::curlEscape(LL_CHANNEL);
-	oStr << "&version=" << LLWeb::curlEscape(version);
+	if(login_page.find("secondlife.com") == -1) {
+		oStr << "&channel=" << LLWeb::curlEscape(LL_CHANNEL);
+		oStr << "&version=" << LLWeb::curlEscape(version);
+	}
 
 	// Grid
 	oStr << "&grid=" << LLWeb::curlEscape(LLViewerLogin::getInstance()->getGridLabel());