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

Fixfudgery

Browse Source
This commit is contained in:
Siana Gearz
2011-07-13 04:44:15 +02:00
parent 3e84087d50
commit 144d96f78c
6 changed files with 16 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
indra/llrender/llfont.cpp
View File

@@ -246,9 +246,9 @@ BOOL LLFont::loadFace(const std::string& filename, const F32 point_size, const F
FT_Set_Charmap(mFTFace, mFTFace->charmaps[0]); FT_Set_Charmap(mFTFace, mFTFace->charmaps[0]);
} }
if (!mIsFallback) if (!mIsFallback || !sOpenGLcrashOnRestart) // because this often crashes under Linux...
{ {
// Add the default glyph // Add the empty glyph`5
addGlyph(0, 0); addGlyph(0, 0);
} }
@@ -362,7 +362,7 @@ BOOL LLFont::addGlyphFromFont(const LLFont *fontp, const llwchar wch, const U32
if (mFTFace == NULL) if (mFTFace == NULL)
return FALSE; return FALSE;
llassert(!mIsFallback); //llassert(!mIsFallback);
fontp->renderGlyph(glyph_index); fontp->renderGlyph(glyph_index);
S32 width = fontp->mFTFace->glyph->bitmap.width; S32 width = fontp->mFTFace->glyph->bitmap.width;
S32 height = fontp->mFTFace->glyph->bitmap.rows; S32 height = fontp->mFTFace->glyph->bitmap.rows;
@@ -581,7 +581,7 @@ void LLFont::setSubImageLuminanceAlpha(const U32 x,
{ {
LLImageRaw *image_raw = mFontBitmapCachep->getImageRaw(bitmap_num); LLImageRaw *image_raw = mFontBitmapCachep->getImageRaw(bitmap_num);
llassert(!mIsFallback); //llassert(!mIsFallback);
llassert(image_raw && (image_raw->getComponents() == 2)); llassert(image_raw && (image_raw->getComponents() == 2));

2
indra/llrender/llfontgl.cpp
View File

@@ -275,7 +275,7 @@ void LLFontGL::destroyAllGL()
else else
{ {
sFontRegistry->destroyGL(); sFontRegistry->destroyGL();
} }
} }
} }

2
indra/lscript/lscript_execute/lscript_readlso.cpp
View File

@@ -120,7 +120,7 @@ void LLScriptLSOParse::printRegisters(LLFILE *fp)
else if (gMajorVersion == LSL2_MAJOR_VERSION_TWO) else if (gMajorVersion == LSL2_MAJOR_VERSION_TWO)
{ {
U64 data = get_register_u64(mRawData, (LSCRIPTRegisters)i); U64 data = get_register_u64(mRawData, (LSCRIPTRegisters)i);
fprintf(fp, "%s: 0x%X%X\n", gLSCRIPTRegisterNames[i], (U32)(data>>32), (U32)(data && 0xFFFFFFFF)); fprintf(fp, "%s: 0x%X%X\n", gLSCRIPTRegisterNames[i], (U32)(data>>32), (U32)(data & 0xFFFFFFFF));
} }
} }
fprintf(fp, "=============================\n\n"); fprintf(fp, "=============================\n\n");

7
indra/newview/linux_tools/wrapper.sh
View File

@@ -68,6 +68,13 @@ if [ "$GTK_IM_MODULE" = "scim" ]; then
export GTK_IM_MODULE=xim export GTK_IM_MODULE=xim
fi fi
# Work around for a crash bug when restarting OpenGL after a change in the
# graphic settings (anti-aliasing, VBO, FSAA, full screen mode, UI scale).
# When you enable this work around, you can change the settings without
# crashing, but you will have to restart the viewer after changing them
# because the display still gets corrupted.
export LL_OPENGL_RESTART_CRASH_BUG=x
## - Automatically work around the ATI mouse cursor crash bug: ## - Automatically work around the ATI mouse cursor crash bug:
## (this workaround is disabled as most fglrx users do not see the bug) ## (this workaround is disabled as most fglrx users do not see the bug)
#if lsmod | grep fglrx &>/dev/null ; then #if lsmod | grep fglrx &>/dev/null ; then

2
indra/newview/llpanelland.cpp
View File

@@ -179,7 +179,7 @@ void LLPanelLandInfo::refresh()
childSetEnabled("button abandon land",owner_release || manager_releaseable || gAgent.isGodlike()); childSetEnabled("button abandon land",owner_release || manager_releaseable || gAgent.isGodlike());
// only mainland sims are subdividable by owner // only mainland sims are subdividable by owner
if (regionp->getRegionFlags() && REGION_FLAGS_ALLOW_PARCEL_CHANGES) if (regionp->getRegionFlags() & REGION_FLAGS_ALLOW_PARCEL_CHANGES)
{ {
childSetEnabled("button subdivide land",owner_divide || manager_divideable || gAgent.isGodlike()); childSetEnabled("button subdivide land",owner_divide || manager_divideable || gAgent.isGodlike());
} }

4
indra/newview/llviewerwindow.cpp
View File

@@ -4445,7 +4445,7 @@ BOOL LLViewerWindow::rawSnapshot(LLImageRaw *raw, S32 image_width, S32 image_hei
//rescale fonts //rescale fonts
initFonts(scale_factor); initFonts(scale_factor);
LLHUDText::reshape(); LLHUDText::reshape();
} }
} }
S32 output_buffer_offset_y = 0; S32 output_buffer_offset_y = 0;
@@ -4608,7 +4608,7 @@ BOOL LLViewerWindow::rawSnapshot(LLImageRaw *raw, S32 image_width, S32 image_hei
gPipeline.resetDrawOrders(); gPipeline.resetDrawOrders();
} }
if (high_res) if (high_res && (show_ui || !hide_hud))
{ {
send_agent_resume(); send_agent_resume();
} }