diff options
| author | Andrey Kleshchev <andreykproductengine@lindenlab.com> | 2023-09-22 01:01:42 +0300 |
|---|---|---|
| committer | akleshchev <117672381+akleshchev@users.noreply.github.com> | 2023-09-22 19:28:23 +0300 |
| commit | 145a5ffe7f57ec87b0604c2e06104a4eb3cb8644 (patch) | |
| tree | 999500f10c986909ff7bc18cae35d7feacbd0bdd /indra/newview/lltexturectrl.cpp | |
| parent | a53d111cfab7b030a4bd603ba163b7cb66f4a35d (diff) | |
SL-15039 Prune unused preferences #3
DebugInventoryFilters
DebugShowXUINames
DebugSlshareLogTag
DebugStat****
DefaultBlankNormalTexture
DefaultObjectNormalTexture
DefaultObjectSpecularTexture
DefaultUploadCost
DisplayAvatarAgentTarget
DisplayChat
DisplayDebug
DisplayDebugConsole
DisplayIM
DisplayLinden
DisplayRegion
DragAndDropToolTipDelay
DragAndDropDistanceThreshold
DropShadowButton
DropShadowFloater
DropShadowSlider
DropShadowTooltip
UIImgWhiteUUID
UseEnvironmentFromRegion
UseDayCycle
WaterPresetName
SkyPresetName
DayCycleName
DestinationGuideHintTimeout
SidePanelHintTimeout
DisablePrecacheDelayAfterTeleporting
Diffstat (limited to 'indra/newview/lltexturectrl.cpp')
| -rw-r--r-- | indra/newview/lltexturectrl.cpp | 11 |
1 files changed, 5 insertions, 6 deletions
diff --git a/indra/newview/lltexturectrl.cpp b/indra/newview/lltexturectrl.cpp index 0ce82a1297..0a95f58c4d 100644 --- a/indra/newview/lltexturectrl.cpp +++ b/indra/newview/lltexturectrl.cpp @@ -86,10 +86,10 @@ static const S32 LOCAL_TRACKING_ID_COLUMN = 1; //static bool get_is_predefined_texture(LLUUID asset_id) { - if (asset_id == LLUUID(gSavedSettings.getString("DefaultObjectTexture")) - || asset_id == LLUUID(gSavedSettings.getString("UIImgWhiteUUID")) - || asset_id == LLUUID(gSavedSettings.getString("UIImgInvisibleUUID")) - || asset_id == LLUUID(SCULPT_DEFAULT_TEXTURE)) + if (asset_id == DEFAULT_OBJECT_TEXTURE + || asset_id == UI_IMAGE_WHITE + || asset_id == UI_IMAGE_INVISIBLE + || asset_id == SCULPT_DEFAULT_TEXTURE) { return true; } @@ -1225,8 +1225,7 @@ LLTextureCtrl::LLTextureCtrl(const LLTextureCtrl::Params& p) // Default of defaults is white image for diff tex // - LLUUID whiteImage( gSavedSettings.getString( "UIImgWhiteUUID" ) ); - setBlankImageAssetID( whiteImage ); + setBlankImageAssetID(UI_IMAGE_WHITE); setAllowNoTexture(p.allow_no_texture); setCanApplyImmediately(p.can_apply_immediately); |