From 32594cd651a327980bb6ef318ee6971f28e41e36 Mon Sep 17 00:00:00 2001 From: Siana Gearz Date: Sat, 14 May 2011 03:27:08 +0200 Subject: [PATCH 1/6] Version 1.5.8(1) --- indra/llcommon/llversionviewer.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/indra/llcommon/llversionviewer.h b/indra/llcommon/llversionviewer.h index 458c3de80..12dda0e7d 100644 --- a/indra/llcommon/llversionviewer.h +++ b/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"; From bd153fc68fd12af8c0dcc5b580c678e3e33d4d81 Mon Sep 17 00:00:00 2001 From: Siana Gearz Date: Sun, 15 May 2011 14:24:15 +0200 Subject: [PATCH 2/6] Public Thread Safety notice: --- indra/llcommon/aithreadsafe.h | 6 +++++- indra/llcommon/llthread.h | 4 ++++ 2 files changed, 9 insertions(+), 1 deletion(-) diff --git a/indra/llcommon/aithreadsafe.h b/indra/llcommon/aithreadsafe.h index 810aa8c2f..2575ba25f 100644 --- a/indra/llcommon/aithreadsafe.h +++ b/indra/llcommon/aithreadsafe.h @@ -278,7 +278,11 @@ struct AIReadAccessConst protected: //! Constructor used by AIReadAccess. AIReadAccessConst(AIThreadSafe& wrapper, state_type state) - : mWrapper(wrapper), mState(state) { } + : mWrapper(wrapper), mState(state) +#if AI_NEED_ACCESS_CC + , mIsCopyConstructed(false) +#endif + { } AIThreadSafe& mWrapper; //!< Reference to the object that we provide access to. state_type const mState; //!< The lock state that mWrapper is in. diff --git a/indra/llcommon/llthread.h b/indra/llcommon/llthread.h index fa003afdd..97dac455e 100644 --- a/indra/llcommon/llthread.h +++ b/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 From 3abc778f2cf0fb8a6a0f46b742fa4e96bf9cace0 Mon Sep 17 00:00:00 2001 From: Siana Gearz Date: Sun, 15 May 2011 20:19:26 +0200 Subject: [PATCH 3/6] Empty splash page workaround --- indra/newview/llpanellogin.cpp | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/indra/newview/llpanellogin.cpp b/indra/newview/llpanellogin.cpp index 7d7d65a35..0f1873505 100644 --- a/indra/newview/llpanellogin.cpp +++ b/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()); From adeba18356fd47d44dab960bd9ec593003904ae8 Mon Sep 17 00:00:00 2001 From: Siana Gearz Date: Mon, 16 May 2011 01:37:00 +0200 Subject: [PATCH 4/6] GCC 4.6 fixes --- indra/cmake/00-Common.cmake | 5 +++++ indra/llcommon/llsdserialize.cpp | 5 ++++- indra/llinventory/llparcel.cpp | 4 ++-- indra/llui/llfunctorregistry.h | 2 -- 4 files changed, 11 insertions(+), 5 deletions(-) diff --git a/indra/cmake/00-Common.cmake b/indra/cmake/00-Common.cmake index 4b2f9dc4b..ef5b14b80 100644 --- a/indra/cmake/00-Common.cmake +++ b/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( diff --git a/indra/llcommon/llsdserialize.cpp b/indra/llcommon/llsdserialize.cpp index 48423934c..b7f28d365 100644 --- a/indra/llcommon/llsdserialize.cpp +++ b/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'); diff --git a/indra/llinventory/llparcel.cpp b/indra/llinventory/llparcel.cpp index 13c062e38..52ee7e3bf 100644 --- a/indra/llinventory/llparcel.cpp +++ b/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; } diff --git a/indra/llui/llfunctorregistry.h b/indra/llui/llfunctorregistry.h index 8864f7af1..7c03f2f69 100644 --- a/indra/llui/llfunctorregistry.h +++ b/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]; From 742ecf395fe3a56d79d8e12363de84fc897d80c1 Mon Sep 17 00:00:00 2001 From: Siana Gearz Date: Mon, 16 May 2011 02:12:46 +0200 Subject: [PATCH 5/6] One last GCC 4.6 stopgap --- indra/llaudio/llaudioengine.h | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/indra/llaudio/llaudioengine.h b/indra/llaudio/llaudioengine.h index 4d5d919e1..83f7f66a5 100644 --- a/indra/llaudio/llaudioengine.h +++ b/indra/llaudio/llaudioengine.h @@ -478,7 +478,7 @@ protected: extern LLAudioEngine* gAudiop; // -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 gSoundHistory; From 1327c80dd7d62555866a193067fb1cadce8b488c Mon Sep 17 00:00:00 2001 From: Siana Gearz Date: Tue, 17 May 2011 00:12:32 +0200 Subject: [PATCH 6/6] Don't assume we have perftools --- indra/cmake/GooglePerfTools.cmake | 1 - 1 file changed, 1 deletion(-) diff --git a/indra/cmake/GooglePerfTools.cmake b/indra/cmake/GooglePerfTools.cmake index a71e29df3..1a12339a7 100644 --- a/indra/cmake/GooglePerfTools.cmake +++ b/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)