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

Merge viewer-quickgraphics

master
Ansariel 2016-03-22 23:27:45 +01:00
parent 581f0e9097 7bbf2ec9f8
commit 59956afb12
4 changed files with 25 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
indra/cmake/run_build_test.py
View File

@ -78,7 +78,7 @@ def main(command, libpath=[], vars={}):
# No idea what the right pathname might be! But only crump if this
# feature is requested.
if libpath:
raise NotImplemented("run_build_test: unknown platform %s" % sys.platform)
raise RuntimeError("run_build_test: unknown platform %s" % sys.platform)
lpvars = []
for var in lpvars:
# Split the existing path. Bear in mind that the variable in question

2
indra/llcommon/indra_constants.cpp
View File

@ -68,4 +68,4 @@ 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_MALEVICH ("3b39cc01-c2d1-e194-1181-e4404978b20c"); // On dataserver
const LLUUID IMG_BLACK_SQUARE ("3b39cc01-c2d1-e194-1181-e4404978b20c"); // On dataserver

2
indra/llcommon/indra_constants.h
View File

@ -208,7 +208,7 @@ 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_MALEVICH;
LL_COMMON_API extern const LLUUID IMG_BLACK_SQUARE;
// radius within which a chat message is fully audible

26
indra/newview/lldrawpoolavatar.cpp
View File

@ -1974,10 +1974,28 @@ void LLDrawPoolAvatar::renderRigged(LLVOAvatar* avatar, U32 type, bool glow)
{
//order is important here LLRender::DIFFUSE_MAP should be last, becouse it change
//(gGL).mCurrTextureUnitIndex
// <FS:Ansariel> Don't assume a certain default texture exists on the server
//gGL.getTexUnit(specular_channel)->bind(LLPipeline::sImpostorRender ? LLViewerTextureManager::findTexture(IMG_BLACK_SQUARE_MALEVICH) : face->getTexture(LLRender::SPECULAR_MAP));
gGL.getTexUnit(specular_channel)->bind(LLPipeline::sImpostorRender ? LLViewerTextureManager::getFetchedTextureFromFile("black_square.png") : face->getTexture(LLRender::SPECULAR_MAP));
// </FS:Ansariel>
LLViewerTexture* specular = NULL;
if (LLPipeline::sImpostorRender)
{
// <FS:Ansariel> Don't assume a certain default texture exists on the server
//std::vector<LLViewerFetchedTexture*> found;
//LLViewerTextureManager::findFetchedTextures(IMG_BLACK_SQUARE, found);
//if (1 <= found.size())
//{
// specular = found[0];
//}
specular = LLViewerTextureManager::getFetchedTextureFromFile("black_square.png");
// </FS:Ansariel>
}
else
{
specular = face->getTexture(LLRender::SPECULAR_MAP);
}
if (specular)
{
gGL.getTexUnit(specular_channel)->bind(specular);
}
gGL.getTexUnit(normal_channel)->bind(face->getTexture(LLRender::NORMAL_MAP));
gGL.getTexUnit(sDiffuseChannel)->bind(face->getTexture(LLRender::DIFFUSE_MAP), false, true);