diff --git a/indra/newview/lllocalbitmaps.h b/indra/newview/lllocalbitmaps.h
index 8dba73f001a33910699590561b0d16f2b9892fdf..def5a6bd6ed44090e3c5b8dff4e2941fe6a8b8c7 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 810c18de40d1eb61f14482cca20d34b95c96f5e9..13d0e377d73ce65103740a74452b43f4a545c8a5 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 8c5afb914aa398d3495b4fb0c79831eba2b67c80..ac0122237f5363dc41efc9b2c3bbd54ea74ad20b 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
         {