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

Merge branch 'master' of https://github.com/singularity-viewer/SingularityViewer.git

Browse Source
This commit is contained in:
Shyotl
2012-12-12 03:11:50 -06:00
parent 2424d2a082 018737eb15
commit cc22edcce3
41 changed files with 2476 additions and 593 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
indra/newview/llfloateravatarlist.cpp
View File

@@ -320,10 +320,10 @@ void LLFloaterAvatarList::onClose(bool app_quitting)
}
}
void cmd_profile(const LLAvatarListEntry* entry);
void cmd_toggle_mark(LLAvatarListEntry* entry);
void cmd_ar(const LLAvatarListEntry* entry);
void cmd_teleport(const LLAvatarListEntry* entry);
static void cmd_profile(const LLAvatarListEntry* entry);
static void cmd_toggle_mark(LLAvatarListEntry* entry);
static void cmd_ar(const LLAvatarListEntry* entry);
static void cmd_teleport(const LLAvatarListEntry* entry);
BOOL LLFloaterAvatarList::postBuild()
{
// Set callbacks
@@ -1447,7 +1447,7 @@ void LLFloaterAvatarList::doCommand(avlist_command_t func, bool single/*=false*/
std::string LLFloaterAvatarList::getSelectedNames(const std::string& separator)
{
std::string ret;
doCommand(boost::bind(&cmd_append_names,_1,ref(ret),separator));
doCommand(boost::bind(&cmd_append_names,_1,boost::ref(ret),separator));
return ret;
}

2
indra/newview/lltexturecache.cpp
View File

@@ -873,7 +873,7 @@ BOOL LLTextureCache::isInLocal(const LLUUID& id)
//static
const S32 MAX_REASONABLE_FILE_SIZE = 512*1024*1024; // 512 MB
F32 LLTextureCache::sHeaderCacheVersion = 1.7f;
F32 LLTextureCache::sHeaderCacheVersion = 1.8f;
U32 LLTextureCache::sCacheMaxEntries = MAX_REASONABLE_FILE_SIZE / TEXTURE_CACHE_ENTRY_SIZE;
S64 LLTextureCache::sCacheMaxTexturesSize = 0; // no limit
const char* entries_filename = "texture.entries";

2
indra/newview/lltexturefetch.cpp
View File

@@ -1282,7 +1282,7 @@ bool LLTextureFetchWorker::doWork(S32 param)
{
//NOTE:
//control the number of the http requests issued for:
//1, not openning too many file descriptors at the same time;
//1, not opening too many file descriptors at the same time;
//2, control the traffic of http so udp gets bandwidth.
//
static const LLCachedControl<U32> max_http_requests("HTTPMaxRequests", 32);

5
indra/newview/llwebprofile.cpp
View File

@@ -39,12 +39,7 @@
#include "llviewermedia.h" // FIXME: don't use LLViewerMedia internals
// third-party JSONCPP
#if !defined(LL_STANDALONE) && defined(LINUX64)
// The prebuilt linux64 package is packaged wrongly.
#include <jsoncpp/reader.h> // JSONCPP
#else
#include <json/reader.h> // JSONCPP
#endif
/*
* Workflow: