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

Post-merge build fixes

master
Andrey Lihatskiy 2020-04-26 21:15:54 +03:00
parent 231dea378b
commit f4c7c8aff5
3 changed files with 4 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
indra/newview/lllocalbitmaps.h
View File

@ -122,9 +122,7 @@ public:
LLUUID getWorldID(LLUUID tracking_id);
bool isLocal(LLUUID world_id);
std::string getFilename(LLUUID tracking_id);
bool isLocalBitmap(LLUUID texture_id);
void feedScrollList(LLScrollListCtrl* ctrl);
void doUpdates();
void setNeedsRebake();

2
indra/newview/llpanelface.cpp
View File

@ -2953,7 +2953,7 @@ void LLPanelFace::onCopyFaces()
if (id.isNull()
|| (!full_perm && item_id.isNull()))
{
if (!LLLocalBitmapMgr::getInstance()->isLocalBitmap(id))
if (!LLLocalBitmapMgr::getInstance()->isLocal(id))
{
te_data["te"].erase("imageid");
te_data["te"]["imageid"] = LLUUID(gSavedSettings.getString("DefaultObjectTexture"));

4
indra/newview/llpanelobject.cpp
View File

@ -2215,7 +2215,7 @@ void LLPanelObject::onCopyParams()
mParamsClipboard["light"]["intensity"] = volobjp->getLightIntensity();
mParamsClipboard["light"]["radius"] = volobjp->getLightRadius();
mParamsClipboard["light"]["falloff"] = volobjp->getLightFalloff();
LLColor3 color = volobjp->getLightColor();
LLColor3 color = volobjp->getLightSRGBColor();
mParamsClipboard["light"]["r"] = color.mV[0];
mParamsClipboard["light"]["g"] = color.mV[1];
mParamsClipboard["light"]["b"] = color.mV[2];
@ -2288,7 +2288,7 @@ void LLPanelObject::onPasteParams()
F32 r = (F32)mParamsClipboard["light"]["r"].asReal();
F32 g = (F32)mParamsClipboard["light"]["g"].asReal();
F32 b = (F32)mParamsClipboard["light"]["b"].asReal();
volobjp->setLightColor(LLColor3(r,g,b));
volobjp->setLightSRGBColor(LLColor3(r, g, b));
}
else
{