Fix merge-related compile errors

5 files changed, 15 insertions, 14 deletions

diff --git a/indra/newview/llfloatereditextdaycycle.cpp b/indra/newview/llfloatereditextdaycycle.cpp
index c92eed42cd..2c10835fb0 100644
--- a/indra/newview/llfloatereditextdaycycle.cpp
+++ b/indra/newview/llfloatereditextdaycycle.cpp
@@ -619,12 +619,12 @@ void LLFloaterEditExtDayCycle::onButtonApply(LLUICtrl *ctrl, const LLSD &data)
                 if (water)
                 {
                     // LLViewerFetchedTexture and check for FTT_LOCAL_FILE or check LLLocalBitmapMgr
-                    if (LLLocalBitmapMgr::isLocal(water->getNormalMapID()))
+                    if (LLLocalBitmapMgr::getInstance()->isLocal(water->getNormalMapID()))
                     {
                         desc = LLTrans::getString("EnvironmentNormalMap");
                         is_local = true;
                     }
-                    else if (LLLocalBitmapMgr::isLocal(water->getTransparentTextureID()))
+                    else if (LLLocalBitmapMgr::getInstance()->isLocal(water->getTransparentTextureID()))
                     {
                         desc = LLTrans::getString("EnvironmentTransparent");
                         is_local = true;
@@ -636,22 +636,22 @@ void LLFloaterEditExtDayCycle::onButtonApply(LLUICtrl *ctrl, const LLSD &data)
                 LLSettingsSky::ptr_t sky = std::static_pointer_cast<LLSettingsSky>(iter->second);
                 if (sky)
                 {
-                    if (LLLocalBitmapMgr::isLocal(sky->getSunTextureId()))
+                    if (LLLocalBitmapMgr::getInstance()->isLocal(sky->getSunTextureId()))
                     {
                         desc = LLTrans::getString("EnvironmentSun");
                         is_local = true;
                     }
-                    else if (LLLocalBitmapMgr::isLocal(sky->getMoonTextureId()))
+                    else if (LLLocalBitmapMgr::getInstance()->isLocal(sky->getMoonTextureId()))
                     {
                         desc = LLTrans::getString("EnvironmentMoon");
                         is_local = true;
                     }
-                    else if (LLLocalBitmapMgr::isLocal(sky->getCloudNoiseTextureId()))
+                    else if (LLLocalBitmapMgr::getInstance()->isLocal(sky->getCloudNoiseTextureId()))
                     {
                         desc = LLTrans::getString("EnvironmentCloudNoise");
                         is_local = true;
                     }
-                    else if (LLLocalBitmapMgr::isLocal(sky->getBloomTextureId()))
+                    else if (LLLocalBitmapMgr::getInstance()->isLocal(sky->getBloomTextureId()))
                     {
                         desc = LLTrans::getString("EnvironmentBloom");
                         is_local = true;
diff --git a/indra/newview/llfloaterfixedenvironment.cpp b/indra/newview/llfloaterfixedenvironment.cpp
index 38b1f5066d..41d9a6d99b 100644
--- a/indra/newview/llfloaterfixedenvironment.cpp
+++ b/indra/newview/llfloaterfixedenvironment.cpp
@@ -402,12 +402,12 @@ void LLFloaterFixedEnvironment::onButtonApply(LLUICtrl *ctrl, const LLSD &data)
         {
             setting_clone = water->buildClone();
             // LLViewerFetchedTexture and check for FTT_LOCAL_FILE or check LLLocalBitmapMgr
-            if (LLLocalBitmapMgr::isLocal(water->getNormalMapID()))
+            if (LLLocalBitmapMgr::getInstance()->isLocal(water->getNormalMapID()))
             {
                 local_desc = LLTrans::getString("EnvironmentNormalMap");
                 is_local = true;
             }
-            else if (LLLocalBitmapMgr::isLocal(water->getTransparentTextureID()))
+            else if (LLLocalBitmapMgr::getInstance()->isLocal(water->getTransparentTextureID()))
             {
                 local_desc = LLTrans::getString("EnvironmentTransparent");
                 is_local = true;
@@ -420,22 +420,22 @@ void LLFloaterFixedEnvironment::onButtonApply(LLUICtrl *ctrl, const LLSD &data)
         if (sky)
         {
             setting_clone = sky->buildClone();
-            if (LLLocalBitmapMgr::isLocal(sky->getSunTextureId()))
+            if (LLLocalBitmapMgr::getInstance()->isLocal(sky->getSunTextureId()))
             {
                 local_desc = LLTrans::getString("EnvironmentSun");
                 is_local = true;
             }
-            else if (LLLocalBitmapMgr::isLocal(sky->getMoonTextureId()))
+            else if (LLLocalBitmapMgr::getInstance()->isLocal(sky->getMoonTextureId()))
             {
                 local_desc = LLTrans::getString("EnvironmentMoon");
                 is_local = true;
             }
-            else if (LLLocalBitmapMgr::isLocal(sky->getCloudNoiseTextureId()))
+            else if (LLLocalBitmapMgr::getInstance()->isLocal(sky->getCloudNoiseTextureId()))
             {
                 local_desc = LLTrans::getString("EnvironmentCloudNoise");
                 is_local = true;
             }
-            else if (LLLocalBitmapMgr::isLocal(sky->getBloomTextureId()))
+            else if (LLLocalBitmapMgr::getInstance()->isLocal(sky->getBloomTextureId()))
             {
                 local_desc = LLTrans::getString("EnvironmentBloom");
                 is_local = true;
diff --git a/indra/newview/llflyoutcombobtn.cpp b/indra/newview/llflyoutcombobtn.cpp
index 48bfb85072..e4f1d9fcaa 100644
--- a/indra/newview/llflyoutcombobtn.cpp
+++ b/indra/newview/llflyoutcombobtn.cpp
@@ -121,7 +121,7 @@ void LLFlyoutComboBtnCtrl::setMenuItemLabel(const std::string &item, const std::
 void LLFlyoutComboBtnCtrl::onFlyoutButton(LLUICtrl *ctrl, const LLSD &data)
 {
 	S32 x, y;
-	LLUI::getMousePositionLocal(mParent, &x, &y);
+    LLUI::getInstance()->getMousePositionLocal(mParent, &x, &y);
 
 	mFlyoutMenu->updateParent(LLMenuGL::sMenuContainer);
 	LLMenuGL::showPopup(mParent, mFlyoutMenu, x, y);
diff --git a/indra/newview/lllocalbitmaps.cpp b/indra/newview/lllocalbitmaps.cpp
index 3c667c2219..5a17332fde 100644
--- a/indra/newview/lllocalbitmaps.cpp
+++ b/indra/newview/lllocalbitmaps.cpp
@@ -1040,7 +1040,7 @@ LLUUID LLLocalBitmapMgr::getWorldID(LLUUID tracking_id)
 
 bool LLLocalBitmapMgr::isLocal(const LLUUID world_id)
 {
-    for (local_list_iter iter = sBitmapList.begin(); iter != sBitmapList.end(); iter++)
+    for (local_list_iter iter = mBitmapList.begin(); iter != mBitmapList.end(); iter++)
     {
         LLLocalBitmap* unit = *iter;
         if (unit->getWorldID() == world_id)
diff --git a/indra/newview/lllocalbitmaps.h b/indra/newview/lllocalbitmaps.h
index f6cc1e919e..d5ee7efdc6 100644
--- a/indra/newview/lllocalbitmaps.h
+++ b/indra/newview/lllocalbitmaps.h
@@ -120,6 +120,7 @@ public:
 	bool 		checkTextureDimensions(std::string filename);
 
 	LLUUID       getWorldID(LLUUID tracking_id);
+    bool         isLocal(LLUUID world_id);
 	std::string  getFilename(LLUUID tracking_id);
 
 	void         feedScrollList(LLScrollListCtrl* ctrl);