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

Fix merge-related compile errors

master
Dave Houlton 2019-11-14 15:19:55 -07:00
parent dc1453af9c
commit e9c0a93f99
5 changed files with 15 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
indra/newview/llfloatereditextdaycycle.cpp
View File

@ -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;

12
indra/newview/llfloaterfixedenvironment.cpp
View File

@ -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;

2
indra/newview/llflyoutcombobtn.cpp
View File

@ -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);

2
indra/newview/lllocalbitmaps.cpp
View File

@ -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)

1
indra/newview/lllocalbitmaps.h
View File

@ -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);