Singularity-Viewer/SingularityViewer
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

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

Browse Source
This commit is contained in:
Shyotl
2011-05-20 12:38:36 -05:00
parent 1a2d75fbe6 1327c80dd7
commit cf6668cb7a
10 changed files with 31 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
indra/cmake/00-Common.cmake
View File

@@ -164,6 +164,11 @@ if (LINUX)
add_definitions(-Wno-parentheses) add_definitions(-Wno-parentheses)
endif (${CXX_VERSION} GREATER 429) 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. # End of hacks.
add_definitions( add_definitions(

1
indra/cmake/GooglePerfTools.cmake
View File

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

8
indra/llaudio/llaudioengine.h
View File

@@ -478,7 +478,7 @@ protected:
extern LLAudioEngine* gAudiop; extern LLAudioEngine* gAudiop;
// <edit> // <edit>
typedef struct struct LLSoundHistoryItem
{ {
LLUUID mID; LLUUID mID;
LLVector3d mPosition; LLVector3d mPosition;
@@ -494,7 +494,11 @@ typedef struct
bool mReviewed; bool mReviewed;
bool mReviewedCollision; bool mReviewedCollision;
LLAudioSource* mAudioSource; 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; extern std::map<LLUUID, LLSoundHistoryItem> gSoundHistory;

6
indra/llcommon/aithreadsafe.h
View File

@@ -278,7 +278,11 @@ struct AIReadAccessConst
protected: protected:
//! Constructor used by AIReadAccess. //! Constructor used by AIReadAccess.
AIReadAccessConst(AIThreadSafe<T>& wrapper, state_type state) 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. AIThreadSafe<T>& mWrapper; //!< Reference to the object that we provide access to.
state_type const mState; //!< The lock state that mWrapper is in. state_type const mState; //!< The lock state that mWrapper is in.

5
indra/llcommon/llsdserialize.cpp
View File

@@ -1447,9 +1447,12 @@ S32 LLSDBinaryFormatter::format(const LLSD& data, std::ostream& ostr, U32 option
} }
case LLSD::TypeUUID: case LLSD::TypeUUID:
{
ostr.put('u'); 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; break;
}
case LLSD::TypeString: case LLSD::TypeString:
ostr.put('s'); ostr.put('s');

4
indra/llcommon/llthread.h
View File

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

2
indra/llcommon/llversionviewer.h
View File

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

4
indra/llinventory/llparcel.cpp
View File

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

2
indra/llui/llfunctorregistry.h
View File

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

6
indra/newview/llpanellogin.cpp
View File

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