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

Randomly replace some old code

master
Ansariel 2023-08-20 01:27:20 +02:00
parent fef3ac1267
commit 1847e2d9b9
12 changed files with 97 additions and 134 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
indra/newview/fsfloaterposestand.cpp
View File

@ -23,7 +23,7 @@
FSFloaterPoseStand::FSFloaterPoseStand(const LLSD& key)
: LLFloater(key),
mComboPose(NULL),
mComboPose(nullptr),
mPoseStandLock(false),
mAOPaused(false)
{

2
indra/newview/fsfloaterradar.cpp
View File

@ -30,7 +30,7 @@
FSFloaterRadar::FSFloaterRadar(const LLSD& key)
: LLFloater(key),
mRadarPanel(NULL)
mRadarPanel(nullptr)
{
}

9
indra/newview/fsfloaterwearablefavorites.cpp
View File

@ -135,8 +135,7 @@ BOOL FSFloaterWearableFavorites::postBuild()
mOptionsButton = getChild<LLMenuButton>("options_btn");
LLToggleableMenu* options_menu = LLUICtrlFactory::getInstance()->createFromFile<LLToggleableMenu>("menu_fs_wearable_favorites.xml", gMenuHolder, LLViewerMenuHolderGL::child_registry_t::instance());
if (options_menu)
if (LLToggleableMenu* options_menu = LLUICtrlFactory::getInstance()->createFromFile<LLToggleableMenu>("menu_fs_wearable_favorites.xml", gMenuHolder, LLViewerMenuHolderGL::child_registry_t::instance()); options_menu)
{
mOptionsMenuHandle = options_menu->getHandle();
mOptionsButton->setMenu(options_menu, LLMenuButton::MP_BOTTOM_LEFT);
@ -204,8 +203,7 @@ BOOL FSFloaterWearableFavorites::handleKeyHere(KEY key, MASK mask)
// static
std::optional<LLUUID> FSFloaterWearableFavorites::getWearableFavoritesFolderID()
{
LLUUID fs_root_cat_id = gInventory.findCategoryByName(ROOT_FIRESTORM_FOLDER);
if (!fs_root_cat_id.isNull())
if (LLUUID fs_root_cat_id = gInventory.findCategoryByName(ROOT_FIRESTORM_FOLDER); !fs_root_cat_id.isNull())
{
LLInventoryModel::item_array_t* items;
LLInventoryModel::cat_array_t* cats;
@ -339,8 +337,7 @@ bool FSFloaterWearableFavorites::onOptionsMenuItemChecked(const LLSD& userdata)
void FSFloaterWearableFavorites::onDoubleClick()
{
LLUUID selected_item_id = mItemsList->getSelectedUUID();
if (selected_item_id.notNull())
if (LLUUID selected_item_id = mItemsList->getSelectedUUID(); selected_item_id.notNull())
{
uuid_vec_t ids;
ids.push_back(selected_item_id);

43
indra/newview/fskeywords.cpp
View File

@ -120,9 +120,9 @@ bool FSKeywords::chatContainsKeyword(const LLChat& chat, bool is_local)
if (sFSKeywordMatchWholeWords)
{
for (std::vector<std::string>::iterator it = mWordList.begin(); it != mWordList.end(); ++it)
for (const auto& word : mWordList)
{
if (boost::regex_search(source, boost::regex("\\b" + (*it) + "\\b")))
if (boost::regex_search(source, boost::regex("\\b" + word + "\\b")))
{
return true;
}
@ -130,9 +130,9 @@ bool FSKeywords::chatContainsKeyword(const LLChat& chat, bool is_local)
}
else
{
for (std::vector<std::string>::iterator it = mWordList.begin(); it != mWordList.end(); ++it)
for (const auto& word : mWordList)
{
if (source.find((*it)) != std::string::npos)
if (source.find(word) != std::string::npos)
{
return true;
}
@ -145,30 +145,27 @@ bool FSKeywords::chatContainsKeyword(const LLChat& chat, bool is_local)
// <FS:PP> FIRE-10178: Keyword Alerts in group IM do not work unless the group is in the foreground
void FSKeywords::notify(const LLChat& chat)
{
if (chat.mFromID != gAgentID || chat.mFromName == SYSTEM_FROM)
if ((chat.mFromID != gAgentID || chat.mFromName == SYSTEM_FROM) && !chat.mMuted && !LLMuteList::getInstance()->isMuted(chat.mFromID))
{
if (!chat.mMuted && !LLMuteList::getInstance()->isMuted(chat.mFromID))
static LLCachedControl<bool> PlayModeUISndFSKeywordSound(gSavedPerAccountSettings, "PlayModeUISndFSKeywordSound");
if (PlayModeUISndFSKeywordSound)
{
static LLCachedControl<bool> PlayModeUISndFSKeywordSound(gSavedPerAccountSettings, "PlayModeUISndFSKeywordSound");
if (PlayModeUISndFSKeywordSound)
{
LLUI::getInstance()->mAudioCallback(LLUUID(gSavedPerAccountSettings.getString("UISndFSKeywordSound")));
}
LLUI::getInstance()->mAudioCallback(LLUUID(gSavedPerAccountSettings.getString("UISndFSKeywordSound")));
}
static LLCachedControl<bool> FSEnableGrowl(gSavedSettings, "FSEnableGrowl");
if (FSEnableGrowl)
static LLCachedControl<bool> FSEnableGrowl(gSavedSettings, "FSEnableGrowl");
if (FSEnableGrowl)
{
std::string msg = chat.mFromName;
if (is_irc_me_prefix(chat.mText))
{
std::string msg = chat.mFromName;
if (is_irc_me_prefix(chat.mText))
{
msg = msg + chat.mText.substr(3);
}
else
{
msg = msg + ": " + chat.mText;
}
GrowlManager::notify("Keyword Alert", msg, GROWL_KEYWORD_ALERT_TYPE);
msg = msg + chat.mText.substr(3);
}
else
{
msg = msg + ": " + chat.mText;
}
GrowlManager::notify("Keyword Alert", msg, GROWL_KEYWORD_ALERT_TYPE);
}
}
}

7
indra/newview/fsmoneytracker.cpp
View File

@ -148,16 +148,13 @@ void FSMoneyTrackerListMenu::onContextMenuItemClick(const LLSD& userdata)
if (option == "copy")
{
FSMoneyTracker* floater = LLFloaterReg::findTypedInstance<FSMoneyTracker>("money_tracker");
if (floater)
if (FSMoneyTracker* floater = LLFloaterReg::findTypedInstance<FSMoneyTracker>("money_tracker"); floater)
{
std::string copy_text;
LLNameListCtrl* list = floater->getChild<LLNameListCtrl>("payment_list");
std::vector<LLScrollListItem*> selected = list->getAllSelected();
for (std::vector<LLScrollListItem*>::iterator it = selected.begin(); it != selected.end(); ++it)
for (auto item : list->getAllSelected())
{
const LLScrollListItem* item = *it;
copy_text += ( (copy_text.empty() ? "" : "\n")
+ item->getColumn(0)->getValue().asString() + ";"
+ item->getColumn(1)->getValue().asString() + ";"

8
indra/newview/fsnearbychathub.cpp
View File

@ -48,10 +48,10 @@
#include "rlvactions.h"
#include "rlvhandler.h"
static const U32 NAME_PREDICTION_MINIMUM_LENGTH = 3;
constexpr U32 NAME_PREDICTION_MINIMUM_LENGTH = 3;
// *HACK* chat bar cannot return its correct height for some reason
static const S32 MAGIC_CHAT_BAR_PAD = 5;
constexpr S32 MAGIC_CHAT_BAR_PAD = 5;
struct LLChatTypeTrigger {
std::string name;
@ -237,8 +237,8 @@ bool matchChatTypeTrigger(const std::string& in_str, std::string* out_str)
S32 FSNearbyChat::sLastSpecialChatChannel = 0;
FSNearbyChat::FSNearbyChat() :
mDefaultChatBar(NULL),
mFocusedInputEditor(NULL)
mDefaultChatBar(nullptr),
mFocusedInputEditor(nullptr)
{
gSavedSettings.getControl("MainChatbarVisible")->getSignal()->connect(boost::bind(&FSNearbyChat::onDefaultChatBarButtonClicked, this));
}

28
indra/newview/fspanelblocklist.cpp
View File

@ -132,12 +132,11 @@ BOOL FSPanelBlockList::handleKeyHere(KEY key, MASK mask)
void FSPanelBlockList::selectBlocked(const LLUUID& mute_id)
{
mBlockedList->deselectAllItems();
std::vector<LLScrollListItem*> items = mBlockedList->getAllData();
for (std::vector<LLScrollListItem*>::iterator it = items.begin(); it != items.end(); it++)
for (auto item : mBlockedList->getAllData())
{
if ((*it)->getColumn(3)->getValue().asUUID() == mute_id)
if (item->getColumn(3)->getValue().asUUID() == mute_id)
{
(*it)->setSelected(TRUE);
item->setSelected(TRUE);
break;
}
}
@ -171,17 +170,15 @@ void FSPanelBlockList::refreshBlockedList()
{
mBlockedList->deleteAllItems();
std::vector<LLMute> mutes = LLMuteList::getInstance()->getMutes();
std::vector<LLMute>::iterator it;
for (it = mutes.begin(); it != mutes.end(); ++it)
for (const auto& mute : LLMuteList::getInstance()->getMutes())
{
LLScrollListItem::Params item_p;
item_p.enabled(TRUE);
item_p.enabled(true);
item_p.value(LLUUID::generateNewID()); // can't link UUID of blocked item directly because of mutes by name
item_p.columns.add().column("item_name").value(it->mName);
item_p.columns.add().column("item_type").value(it->getDisplayType());
item_p.columns.add().column("item_mute_type").value(it->mType);
item_p.columns.add().column("item_mute_uuid").value(it->mID);
item_p.columns.add().column("item_name").value(mute.mName);
item_p.columns.add().column("item_type").value(mute.getDisplayType());
item_p.columns.add().column("item_mute_type").value(mute.mType);
item_p.columns.add().column("item_mute_uuid").value(mute.mID);
mBlockedList->addRow(item_p, ADD_BOTTOM);
}
@ -208,11 +205,10 @@ void FSPanelBlockList::removeMutes()
// list after each removal, sending us straight into a crash!
LLMuteList::getInstance()->removeObserver(this);
std::vector<LLScrollListItem*> selected_items = mBlockedList->getAllSelected();
for (std::vector<LLScrollListItem*>::iterator it = selected_items.begin(); it != selected_items.end(); it++)
for (auto item : mBlockedList->getAllSelected())
{
std::string name = (*it)->getColumn(COL_NAME)->getValue().asString();
LLUUID id = (*it)->getColumn(COL_UUID)->getValue().asUUID();
std::string name = item->getColumn(COL_NAME)->getValue().asString();
LLUUID id = item->getColumn(COL_UUID)->getValue().asUUID();
LLMute mute(id, name);
LLMuteList::getInstance()->remove(mute);
}

56
indra/newview/fspanelradar.cpp
View File

@ -89,7 +89,7 @@ FSPanelRadar::FSPanelRadar()
mFSRadarColumnConfigConnection(),
mLastResizeDelta(0)
{
mButtonsUpdater = new FSButtonsUpdater(boost::bind(&FSPanelRadar::updateButtons, this));
mButtonsUpdater = std::make_unique<FSButtonsUpdater>(boost::bind(&FSPanelRadar::updateButtons, this));
mCommitCallbackRegistrar.add("Radar.AddFriend", boost::bind(&FSPanelRadar::onAddFriendButtonClicked, this));
mCommitCallbackRegistrar.add("Radar.Gear", boost::bind(&FSPanelRadar::onGearButtonClicked, this, _1));
@ -117,9 +117,8 @@ FSPanelRadar::~FSPanelRadar()
mFSRadarColumnConfigConnection.disconnect();
}
delete mButtonsUpdater;
if (mOptionsMenuHandle.get()) mOptionsMenuHandle.get()->die();
if (mOptionsMenuHandle.get())
mOptionsMenuHandle.get()->die();
}
BOOL FSPanelRadar::postBuild()
@ -152,8 +151,7 @@ BOOL FSPanelRadar::postBuild()
mRadarGearButton = getChild<LLButton>("gear_btn");
mOptionsButton = getChild<LLMenuButton>("options_btn");
LLToggleableMenu* options_menu = LLUICtrlFactory::getInstance()->createFromFile<LLToggleableMenu>("menu_fs_radar_options.xml", gMenuHolder, LLViewerMenuHolderGL::child_registry_t::instance());
if (options_menu)
if (LLToggleableMenu* options_menu = LLUICtrlFactory::getInstance()->createFromFile<LLToggleableMenu>("menu_fs_radar_options.xml", gMenuHolder, LLViewerMenuHolderGL::child_registry_t::instance()); options_menu)
{
mOptionsMenuHandle = options_menu->getHandle();
mOptionsButton->setMenu(options_menu, LLMenuButton::MP_BOTTOM_LEFT);
@ -204,8 +202,7 @@ void FSPanelRadar::updateButtons()
LLUUID FSPanelRadar::getCurrentItemID() const
{
LLScrollListItem* item = mRadarList->getFirstSelected();
if (item)
if (LLScrollListItem* item = mRadarList->getFirstSelected(); item)
{
return item->getUUID();
}
@ -251,21 +248,14 @@ void FSPanelRadar::onRadarListDoubleClicked()
LLUUID clicked_id = item->getUUID();
std::string name = item->getColumn(mRadarList->getColumn("name")->mIndex)->getValue().asString();
FSRadar* radar = FSRadar::getInstance();
if (radar)
{
radar->zoomAvatar(clicked_id, name);
}
FSRadar::getInstance()->zoomAvatar(clicked_id, name);
}
void FSPanelRadar::onRadarListCommitted()
{
uuid_vec_t selected_uuids;
LLUUID sVal = mRadarList->getSelectedValue().asUUID();
if (sVal.notNull())
if (LLUUID sVal = mRadarList->getSelectedValue().asUUID(); sVal.notNull())
{
selected_uuids.push_back(sVal);
mMiniMap->setSelected(selected_uuids);
mMiniMap->setSelected({ sVal });
}
updateButtons();
@ -274,8 +264,7 @@ void FSPanelRadar::onRadarListCommitted()
void FSPanelRadar::onAddFriendButtonClicked()
{
LLUUID id = getCurrentItemID();
if (id.notNull())
if (LLUUID id = getCurrentItemID(); id.notNull())
{
LLAvatarActions::requestFriendshipDialog(id);
}
@ -301,14 +290,10 @@ void FSPanelRadar::onGearButtonClicked(LLUICtrl* btn)
void FSPanelRadar::requestUpdate()
{
FSRadar* radar = FSRadar::getInstance();
if (radar)
{
std::vector<LLSD> entries;
LLSD stats;
radar->getCurrentData(entries, stats);
updateList(entries, stats);
}
std::vector<LLSD> entries;
LLSD stats;
FSRadar::getInstance()->getCurrentData(entries, stats);
updateList(entries, stats);
}
void FSPanelRadar::updateList(const std::vector<LLSD>& entries, const LLSD& stats)
@ -422,21 +407,21 @@ void FSPanelRadar::updateList(const std::vector<LLSD>& entries, const LLSD& stat
radarNameCell->setColor(LLColor4(options["name_color"]));
}
LLScrollListText* voiceLevelCell = (LLScrollListText*)row->getColumn(voiceLevelColumnIndex);
if (entry.has("voice_level_icon"))
{
LLScrollListText* voiceLevelCell = (LLScrollListText*)row->getColumn(voiceLevelColumnIndex);
voiceLevelCell->setValue(entry["voice_level_icon"].asString());
}
LLScrollListText* flagsCell = (LLScrollListText*)row->getColumn(flagsColumnIndex);
if (entry.has("flags"))
{
LLScrollListText* flagsCell = (LLScrollListText*)row->getColumn(flagsColumnIndex);
flagsCell->setValue(flagsColumnValues[entry["flags"].asInteger()]);
}
LLScrollListText* ageCell = (LLScrollListText*)row->getColumn(ageColumnIndex);
if (options.has("age_color"))
{
LLScrollListText* ageCell = (LLScrollListText*)row->getColumn(ageColumnIndex);
ageCell->setColor(LLColor4(options["age_color"]));
}
}
@ -477,7 +462,7 @@ void FSPanelRadar::onColumnDisplayModeChanged()
std::vector<LLScrollListColumn::Params> column_params = mRadarList->getColumnInitParams();
S32 column_padding = mRadarList->getColumnPadding();
LLFloater* parent_floater = nullptr;
LLFloater* parent_floater{ nullptr };
LLView* parent = getParent();
while (parent)
{
@ -493,8 +478,8 @@ void FSPanelRadar::onColumnDisplayModeChanged()
return;
}
S32 default_width = 0;
S32 new_width = 0;
S32 default_width{ 0 };
S32 new_width{ 0 };
S32 min_width, min_height;
parent_floater->getResizeLimits(&min_width, &min_height);
@ -558,8 +543,7 @@ void FSPanelRadar::onColumnVisibilityChecked(const LLSD& userdata)
U32 column_config = gSavedSettings.getU32("FSRadarColumnConfig");
U32 new_value;
U32 enabled = (mColumnBits[column] & column_config);
if (enabled)
if (U32 enabled = (mColumnBits[column] & column_config); enabled)
{
new_value = (column_config & ~mColumnBits[column]);
}

2
indra/newview/fspanelradar.h
View File

@ -92,7 +92,7 @@ private:
LLHandle<LLView> mOptionsMenuHandle;
FSRadar::Updater* mButtonsUpdater;
std::unique_ptr<FSRadar::Updater> mButtonsUpdater;
std::string mFilterSubString;
std::string mFilterSubStringOrig;

22
indra/newview/fsradar.cpp
View File

@ -290,14 +290,13 @@ void FSRadar::updateRadarList()
// Skip modelling this avatar if its basic data is either inaccessible, or it's a dummy placeholder
auto ent = getEntry(avId);
LLViewerRegion* reg = world->getRegionFromPosGlobal(avPos);
if (!ent) // don't update this radar listing if data is inaccessible
{
continue;
}
// Try to get the avatar's viewer object - we will need it anyway later
LLVOAvatar* avVo = (LLVOAvatar*)gObjectList.findObject(avId);
LLVOAvatar* avVo = static_cast<LLVOAvatar*>(gObjectList.findObject(avId));
static LLUICachedControl<bool> sFSShowDummyAVsinRadar("FSShowDummyAVsinRadar");
if (!sFSShowDummyAVsinRadar && avVo && avVo->mIsDummy)
@ -315,7 +314,7 @@ void FSRadar::updateRadarList()
}
LLUUID avRegion;
if (reg)
if (LLViewerRegion* reg = world->getRegionFromPosGlobal(avPos); reg)
{
avRegion = reg->getRegionID();
}
@ -595,11 +594,10 @@ void FSRadar::updateRadarList()
// Voice power level indicator
if (voice_client->voiceEnabled() && voice_client->isVoiceWorking())
{
LLSpeaker* speaker = speakermgr->findSpeaker(avId);
if (speaker && speaker->isInVoiceChannel())
if (LLSpeaker* speaker = speakermgr->findSpeaker(avId); speaker && speaker->isInVoiceChannel())
{
EVoicePowerLevel power_level = voice_client->getPowerLevel(avId);
switch (power_level)
{
case VPL_PTT_Off:
@ -703,8 +701,7 @@ void FSRadar::updateRadarList()
}
static LLCachedControl<S32> sRadarAlertChannel(gSavedSettings, "RadarAlertChannel");
U32 num_entering = (U32)mRadarEnterAlerts.size();
if (num_entering > 0)
if (U32 num_entering = (U32)mRadarEnterAlerts.size(); num_entering > 0)
{
mRadarFrameCount++;
U32 num_this_pass = llmin(FSRADAR_MAX_AVATARS_PER_ALERT, num_entering);
@ -732,8 +729,8 @@ void FSRadar::updateRadarList()
msg = llformat("%d,%d", mRadarFrameCount, num_this_pass);
}
}
U32 num_leaving = (U32)mRadarLeaveAlerts.size();
if (num_leaving > 0)
if (U32 num_leaving = (U32)mRadarLeaveAlerts.size(); num_leaving > 0)
{
mRadarFrameCount++;
U32 num_this_pass = llmin(FSRADAR_MAX_AVATARS_PER_ALERT, num_leaving);
@ -1010,10 +1007,9 @@ void FSRadar::zoomAvatar(const LLUUID& avatar_id, std::string_view name)
void FSRadar::updateNames()
{
const entry_map_t::iterator it_end = mEntryList.end();
for (entry_map_t::iterator it = mEntryList.begin(); it != it_end; ++it)
for (auto& [av_id, entry] : mEntryList)
{
it->second->updateName();
entry->updateName();
}
}

12
indra/newview/fsradarlistctrl.cpp
View File

@ -43,25 +43,23 @@ BOOL FSRadarListCtrl::handleRightMouseDown(S32 x, S32 y, MASK mask)
BOOL handled = LLUICtrl::handleRightMouseDown(x, y, mask);
if ( (mContextMenu) && (!gRlvHandler.hasBehaviour(RLV_BHVR_SHOWNAMES)) )
{
std::vector<LLScrollListItem*> selected_items = getAllSelected();
if (selected_items.size() > 1)
if (std::vector<LLScrollListItem*> selected_items = getAllSelected(); selected_items.size() > 1)
{
uuid_vec_t selected_uuids;
for (std::vector<LLScrollListItem*>::iterator it = selected_items.begin(); it != selected_items.end(); ++it)
for (auto selected_item : selected_items)
{
selected_uuids.push_back((*it)->getUUID());
selected_uuids.emplace_back(selected_item->getUUID());
}
mContextMenu->show(this, selected_uuids, x, y);
}
else
{
LLScrollListItem* hit_item = hitItem(x, y);
if (hit_item)
if (LLScrollListItem* hit_item = hitItem(x, y); hit_item)
{
selectByID(hit_item->getValue());
LLUUID av = hit_item->getValue();
uuid_vec_t selected_uuids;
selected_uuids.push_back(av);
selected_uuids.emplace_back(av);
mContextMenu->show(this, selected_uuids, x, y);
}
}

40
indra/newview/llpanelobject.cpp
View File

@ -1500,25 +1500,23 @@ void LLPanelObject::deactivateStandardFields()
getChildView("advanced_slice")->setVisible(FALSE);
}
void LLPanelObject::activateMeshFields(LLViewerObject * objectp)
void LLPanelObject::activateMeshFields(LLViewerObject* objectp)
{
LLStringUtil::format_map_t args;
static const char * dataFields[4] = { "LOWESTTRIS", "LOWTRIS", "MIDTRIS", "HIGHTRIS" };
LLTextBox *num_tris = getChild<LLTextBox>("mesh_lod_num_tris");
if (num_tris)
LLTextBox* num_tris = getChild<LLTextBox>("mesh_lod_num_tris");
for (int i = 0; i < 4; i++)
{
for (int i = 0; i < 4; i++)
{
args[dataFields[i]] = llformat("%d", objectp->mDrawable->getVOVolume()->getLODTriangleCount(i));
}
num_tris->setText(getString("mesh_lod_num_tris_values",args));
num_tris->setVisible(TRUE);
args[dataFields[i]] = llformat("%d", objectp->mDrawable->getVOVolume()->getLODTriangleCount(i));
}
childSetVisible("mesh_info_label", TRUE);
childSetVisible("lod_label", TRUE);
childSetVisible("lod_num_tris", TRUE);
childSetVisible("mesh_lod_label", TRUE);
num_tris->setText(getString("mesh_lod_num_tris_values",args));
num_tris->setVisible(TRUE);
childSetVisible("mesh_info_label", true);
childSetVisible("lod_label", true);
childSetVisible("lod_num_tris", true);
childSetVisible("mesh_lod_label", true);
// Mesh specific display
mComboLOD->setEnabled(TRUE);
mComboLOD->setVisible(TRUE);
@ -1541,7 +1539,7 @@ void LLPanelObject::activateMeshFields(LLViewerObject * objectp)
radius = objectp->getVolume() ? objectp->getVolume()->mLODScaleBias.scaledVec(objectp->getScale()).length() : objectp->getScale().length();
}
static const F32 max_distance = 512.f;
constexpr F32 max_distance = 512.f;
F32 factor;
F32 dlowest = llmin(radius / 0.03f, max_distance);
F32 dlow = llmin(radius / 0.06f, max_distance);
@ -1591,7 +1589,7 @@ void LLPanelObject::activateMeshFields(LLViewerObject * objectp)
setLODDistValues(tb, factor, dmid, dlow, dlowest);
}
void LLPanelObject::setLODDistValues(LLTextBox * tb, F32 factor, F32 dmid, F32 dlow, F32 dlowest)
void LLPanelObject::setLODDistValues(LLTextBox* tb, F32 factor, F32 dmid, F32 dlow, F32 dlowest)
{
if (tb)
{
@ -1607,11 +1605,11 @@ void LLPanelObject::setLODDistValues(LLTextBox * tb, F32 factor, F32 dmid, F32 d
void LLPanelObject::deactivateMeshFields()
{
childSetVisible("mesh_info_label", FALSE);
childSetVisible("lod_label", FALSE);
childSetVisible("lod_num_tris", FALSE);
childSetVisible("mesh_lod_num_tris", FALSE);
childSetVisible("mesh_lod_label", FALSE);
childSetVisible("mesh_info_label", false);
childSetVisible("lod_label", false);
childSetVisible("lod_num_tris", false);
childSetVisible("mesh_lod_num_tris", false);
childSetVisible("mesh_lod_label", false);
// reset the debug setting as we are editing a new object
gSavedSettings.setS32("ShowSpecificLODInEdit", -1);
// </FS:Beq>
@ -1620,7 +1618,7 @@ void LLPanelObject::deactivateMeshFields()
mComboLOD->setEnabled(FALSE);
mComboLOD->setVisible(FALSE);
childSetVisible("object_radius", FALSE);
childSetVisible("object_radius", false);
LLTextBox* tb = getChild<LLTextBox>("object_radius_value");
tb->setVisible(FALSE);