From f4c7c8aff55d0cd8f044d5b7c8cddb2be750dde5 Mon Sep 17 00:00:00 2001
From: Andrey Lihatskiy <alihatskiy@productengine.com>
Date: Sun, 26 Apr 2020 21:15:54 +0300
Subject: [PATCH] Post-merge build fixes
---
indra/newview/lllocalbitmaps.h | 4 +---
indra/newview/llpanelface.cpp | 2 +-
indra/newview/llpanelobject.cpp | 4 ++--
3 files changed, 4 insertions(+), 6 deletions(-)
diff --git a/indra/newview/lllocalbitmaps.h b/indra/newview/lllocalbitmaps.h
index 8dba73f001a..def5a6bd6ed 100644
--- a/indra/newview/lllocalbitmaps.h
+++ b/indra/newview/lllocalbitmaps.h
@@ -122,9 +122,7 @@ class LLLocalBitmapMgr : public LLSingleton<LLLocalBitmapMgr>
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();
diff --git a/indra/newview/llpanelface.cpp b/indra/newview/llpanelface.cpp
index 810c18de40d..13d0e377d73 100644
--- a/indra/newview/llpanelface.cpp
+++ b/indra/newview/llpanelface.cpp
@@ -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"));
diff --git a/indra/newview/llpanelobject.cpp b/indra/newview/llpanelobject.cpp
index 8c5afb914aa..ac0122237f5 100644
--- a/indra/newview/llpanelobject.cpp
+++ b/indra/newview/llpanelobject.cpp
@@ -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
{
--
GitLab