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

Fix los argumentos truncamientos

Browse Source 
Gracias a Damian
This commit is contained in:
Lirusaito
2019-02-17 16:46:51 -05:00
parent 50f9fbd728
commit 2773c22f9b
2 changed files with 2 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
indra/llrender/llpostprocess.cpp
View File

@@ -286,7 +286,7 @@ public:
LLVector2 screen_rect = LLPostProcess::getInstance()->getDimensions(); LLVector2 screen_rect = LLPostProcess::getInstance()->getDimensions();
mPassLoc = getShader().getUniformLocation(sHorizontalPass); mPassLoc = getShader().getUniformLocation(sHorizontalPass);
LLVector4 vec[] = { LLVector4(1.3846153846, 3.2307692308, 0, 0) / screen_rect.mV[VX], LLVector4( 0,0, 1.3846153846, 3.2307692308 ) / screen_rect.mV[VY] }; LLVector4 vec[] = { LLVector4(1.3846153846f, 3.2307692308f, 0.f, 0.f) / screen_rect.mV[VX], LLVector4( 0.f,0.f, 1.3846153846f, 3.2307692308f ) / screen_rect.mV[VY] };
getShader().uniform4fv(sKern, LL_ARRAY_SIZE(vec), (GLfloat*)vec); getShader().uniform4fv(sKern, LL_ARRAY_SIZE(vec), (GLfloat*)vec);
return QUAD_NORMAL; return QUAD_NORMAL;
} }

2
indra/newview/llnotify.cpp
View File

@@ -247,7 +247,7 @@ LLNotifyBox::LLNotifyBox(LLNotificationPtr notification)
auto text_color = gColors.getColor(mIsCaution && mIsTip ? "NotifyCautionWarnColor" : "NotifyTextColor"); auto text_color = gColors.getColor(mIsCaution && mIsTip ? "NotifyCautionWarnColor" : "NotifyTextColor");
text->setReadOnlyFgColor(text_color); //sets caution text color for tip notifications text->setReadOnlyFgColor(text_color); //sets caution text color for tip notifications
if (!mIsCaution) // We could do some extra color math here to determine if bg's too close to link color, but let's just cross with the link color instead if (!mIsCaution) // We could do some extra color math here to determine if bg's too close to link color, but let's just cross with the link color instead
text->setLinkColor(new LLColor4(lerp(text_color, gSavedSettings.getColor4("HTMLLinkColor"), 0.4))); text->setLinkColor(new LLColor4(lerp(text_color, gSavedSettings.getColor4("HTMLLinkColor"), 0.4f)));
text->setTabStop(FALSE); // can't tab to it (may be a problem for scrolling via keyboard) text->setTabStop(FALSE); // can't tab to it (may be a problem for scrolling via keyboard)
text->appendText(message,false,false,nullptr,!layout_script_dialog); // Now we can set the text, since colors have been set. text->appendText(message,false,false,nullptr,!layout_script_dialog); // Now we can set the text, since colors have been set.
addChild(text); addChild(text);