livie
/
phoenix-firestorm
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge viewer-quickgraphics

master
Ansariel 2016-04-23 12:26:49 +02:00
parent ac4e61cb8d 574963ff6d
commit 607625a1b5
11 changed files with 26 additions and 20 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
autobuild.xml
View File

@ -1757,7 +1757,7 @@
<key>archive</key>
<map>
<key>hash</key>
<string>4a9dbeb437d0e1546b93d16073ff1442</string>
<string>e760be34addeb0cd6e2ec43394834bac</string>
<key>url</key>
<string>http://s3-proxy.lindenlab.com/private-builds-secondlife-com/hg/repo/llphysicsextensions/rev/313564/arch/CYGWIN/installer/llphysicsextensions_source-1.0.313564-windows-313564.tar.bz2</string>
</map>

1
indra/llcommon/indra_constants.cpp
View File

@ -68,4 +68,3 @@ const LLUUID TERRAIN_ROCK_DETAIL ("53a2f406-4895-1d13-d541-d2e3b86bc19c"); // V
const LLUUID DEFAULT_WATER_NORMAL ("822ded49-9a6c-f61c-cb89-6df54f42cdf4"); // VIEWER
const LLUUID IMG_BLACK_SQUARE ("3b39cc01-c2d1-e194-1181-e4404978b20c"); // On dataserver

2
indra/llcommon/indra_constants.h
View File

@ -208,8 +208,6 @@ LL_COMMON_API extern const LLUUID TERRAIN_ROCK_DETAIL;
LL_COMMON_API extern const LLUUID DEFAULT_WATER_NORMAL;
LL_COMMON_API extern const LLUUID IMG_BLACK_SQUARE;
// radius within which a chat message is fully audible
const F32 CHAT_NORMAL_RADIUS = 20.f;

7
indra/llcrashlogger/llcrashlogger.cpp
View File

@ -70,6 +70,9 @@ std::string getStartupStateFromLog(std::string& sllog);
int LLCrashLogger::ssl_mutex_count = 0;
LLCoreInt::HttpMutex ** LLCrashLogger::ssl_mutex_list = NULL;
#define CRASH_UPLOAD_RETRIES 3 /* seconds */
#define CRASH_UPLOAD_TIMEOUT 180 /* seconds */
class LLCrashLoggerHandler : public LLHttpSDHandler
{
LOG_CLASS(LLCrashLoggerHandler);
@ -597,7 +600,7 @@ bool LLCrashLogger::sendCrashLog(std::string dump_dir)
msg = msg+mCrashHost.c_str();
updateApplication(msg.c_str());
sent = runCrashLogPost(mCrashHost, post_data, std::string("Sending to server"), 3, 5);
sent = runCrashLogPost(mCrashHost, post_data, std::string("Sending to server"), CRASH_UPLOAD_RETRIES, CRASH_UPLOAD_TIMEOUT);
}
// <FS:ND> We do not send to mAltCrashHost ever.
@ -605,7 +608,7 @@ bool LLCrashLogger::sendCrashLog(std::string dump_dir)
// if(!sent)
// {
//updateApplication("Using default server...");
// sent = runCrashLogPost(mAltCrashHost, post_data, std::string("Sending to alternate server"), 3, 5);
// sent = runCrashLogPost(mAltCrashHost, post_data, std::string("Sending to alternate server"), CRASH_UPLOAD_RETRIES, CRASH_UPLOAD_TIMEOUT);
// }
// </FS:ND>

1
indra/newview/llappviewer.h
View File

@ -440,6 +440,7 @@ extern BOOL gPrintMessagesThisFrame;
extern LLUUID gSunTextureID;
extern LLUUID gMoonTextureID;
extern LLUUID gBlackSquareID;
extern BOOL gRandomizeFramerate;
extern BOOL gPeriodicSlowFrame;

12
indra/newview/lldrawpoolavatar.cpp
View File

@ -50,6 +50,7 @@
#include "llrendersphere.h"
#include "llviewerpartsim.h"
#include "llviewercontrol.h" // for gSavedSettings
#include "llviewertexturelist.h"
// <FS:Zi> Add avatar hitbox debug
#include "llviewercontrol.h"
@ -69,6 +70,7 @@ BOOL LLDrawPoolAvatar::sSkipTransparent = FALSE;
S32 LLDrawPoolAvatar::sDiffuseChannel = 0;
F32 LLDrawPoolAvatar::sMinimumAlpha = 0.2f;
LLUUID gBlackSquareID;
static bool is_deferred_render = false;
static bool is_post_deferred_render = false;
@ -1399,7 +1401,7 @@ void LLDrawPoolAvatar::renderAvatars(LLVOAvatar* single_avatar, S32 pass)
avatarp->mImpostor.bindTexture(1, specular_channel);
}
}
avatarp->renderImpostor(LLColor4U(255,255,255,255), sDiffuseChannel);
avatarp->renderImpostor(avatarp->getMutedAVColor(), sDiffuseChannel);
}
return;
}
@ -1977,12 +1979,8 @@ void LLDrawPoolAvatar::renderRigged(LLVOAvatar* avatar, U32 type, bool glow)
LLViewerTexture* specular = NULL;
if (LLPipeline::sImpostorRender)
{
std::vector<LLViewerFetchedTexture*> found;
LLViewerTextureManager::findFetchedTextures(IMG_BLACK_SQUARE, found);
if (1 <= found.size())
{
specular = found[0];
}
specular = LLViewerTextureManager::findFetchedTexture(gBlackSquareID, TEX_LIST_DISCARD);
llassert(NULL != specular);
}
else
{

5
indra/newview/llpreviewscript.cpp
View File

@ -2675,10 +2675,6 @@ void LLLiveLSLEditor::draw()
// incorrect after a release/claim cycle, but will be
// correct after clicking on it.
runningCheckbox->set(FALSE);
// <FS:Ansariel> Rev 496 LL merge error
//mMonoCheckbox->setEnabled(FALSE);
// object may have fallen out of range.
//mHaveRunningInfo = FALSE;
mMonoCheckbox->set(FALSE);
}
}
@ -2688,7 +2684,6 @@ void LLLiveLSLEditor::draw()
// Really ought to put in main window.
setTitle(LLTrans::getString("ObjectOutOfRange"));
runningCheckbox->setEnabled(FALSE);
// <FS:Ansariel> Rev 496 LL merge error
mMonoCheckbox->setEnabled(FALSE);
// object may have fallen out of range.
mHaveRunningInfo = FALSE;

1
indra/newview/llviewertexture.cpp
View File

@ -1164,6 +1164,7 @@ void LLViewerFetchedTexture::init(bool firstinit)
mLastCallBackActiveTime = 0.f;
mForceCallbackFetch = FALSE;
mInDebug = FALSE;
mUnremovable = FALSE;
mFTType = FTT_UNKNOWN;
}

6
indra/newview/llviewertexture.h
View File

@ -374,7 +374,10 @@ public:
bool updateFetch();
bool setDebugFetching(S32 debug_level);
bool isInDebug() {return mInDebug;}
bool isInDebug() const { return mInDebug; }
void setUnremovable(BOOL value) { mUnremovable = value; }
bool isUnremovable() const { return mUnremovable; }
void clearFetchedResults(); //clear all fetched results, for debug use.
@ -467,6 +470,7 @@ private:
private:
BOOL mFullyLoaded;
BOOL mInDebug;
BOOL mUnremovable;
BOOL mInFastCacheList;
BOOL mForceCallbackFetch;

8
indra/newview/llviewertexturelist.cpp
View File

@ -187,6 +187,12 @@ void LLViewerTextureList::doPreloadImages()
mImagePreloads.insert(image);
}
LLPointer<LLImageRaw> img_blak_square_tex(new LLImageRaw(2, 2, 3));
memset(img_blak_square_tex->getData(), 0, img_blak_square_tex->getDataSize());
LLPointer<LLViewerFetchedTexture> img_blak_square(new LLViewerFetchedTexture(img_blak_square_tex, FTT_DEFAULT, FALSE));
gBlackSquareID = img_blak_square->getID();
img_blak_square->setUnremovable(TRUE);
addImage(img_blak_square, TEX_LIST_DISCARD);
}
static std::string get_texture_list_name()
@ -861,7 +867,7 @@ void LLViewerTextureList::updateImagesDecodePriorities()
LLPointer<LLViewerFetchedTexture> imagep = iter->second;
++iter; // safe to increment now
if(imagep->isInDebug())
if(imagep->isInDebug() || imagep->isUnremovable())
{
update_counter--;
continue; //is in debug, ignore.

1
scripts/packages-formatter.py
View File

@ -97,3 +97,4 @@ for pkg in sorted(version):
print copyright[pkg]
else:
sys.exit("No copyright for %s" % pkg)
print ''