Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

#2432 default nametags to only show briefly and #2431 fix redundant search for pixiesmall.j2c #2435

Merged
merged 2 commits into from
Aug 28, 2024
Merged

#2432 default nametags to only show briefly and #2431 fix redundant search for pixiesmall.j2c #2435

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
feecf09
#2431 Fix for redundant searching for pixeismall.j2c causing frame st…
RunitaiLinden Aug 27, 2024
00acf4f
#2432 Make nametags default to "show briefly"
RunitaiLinden Aug 27, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 2 additions & 0 deletions indra/llfilesystem/lldir.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -721,6 +721,8 @@ std::vector<std::string> LLDir::findSkinnedFilenames(const std::string& subdir,
const std::string& filename,
ESkinConstraint constraint) const
{
LL_PROFILE_ZONE_SCOPED_CATEGORY_UI;

// Recognize subdirs that have no localization.
static const std::set<std::string> sUnlocalized = list_of
("") // top-level directory not localized
Expand Down
2 changes: 1 addition & 1 deletion indra/newview/app_settings/settings.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10314,7 +10314,7 @@
<key>Type</key>
<string>S32</string>
<key>Value</key>
<integer>1</integer>
<integer>2</integer>
</map>
<key>ShowAxes</key>
<map>
Expand Down
7 changes: 5 additions & 2 deletions indra/newview/llviewerobject.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6020,6 +6020,7 @@ bool LLViewerObject::isParticleSource() const

void LLViewerObject::setParticleSource(const LLPartSysData& particle_parameters, const LLUUID& owner_id)
{
LL_PROFILE_ZONE_SCOPED_CATEGORY_VIEWER;
if (mPartSourcep)
{
deleteParticleSource();
Expand Down Expand Up @@ -6051,6 +6052,7 @@ void LLViewerObject::setParticleSource(const LLPartSysData& particle_parameters,

void LLViewerObject::unpackParticleSource(const S32 block_num, const LLUUID& owner_id)
{
LL_PROFILE_ZONE_SCOPED_CATEGORY_VIEWER;
if (!mPartSourcep.isNull() && mPartSourcep->isDead())
{
mPartSourcep = NULL;
Expand Down Expand Up @@ -6086,7 +6088,7 @@ void LLViewerObject::unpackParticleSource(const S32 block_num, const LLUUID& own
LLViewerTexture* image;
if (mPartSourcep->mPartSysData.mPartImageID == LLUUID::null)
{
image = LLViewerTextureManager::getFetchedTextureFromFile("pixiesmall.j2c");
image = LLViewerFetchedTexture::sDefaultParticleImagep;
}
else
{
Expand All @@ -6099,6 +6101,7 @@ void LLViewerObject::unpackParticleSource(const S32 block_num, const LLUUID& own

void LLViewerObject::unpackParticleSource(LLDataPacker &dp, const LLUUID& owner_id, bool legacy)
{
LL_PROFILE_ZONE_SCOPED_CATEGORY_VIEWER;
if (!mPartSourcep.isNull() && mPartSourcep->isDead())
{
mPartSourcep = NULL;
Expand Down Expand Up @@ -6133,7 +6136,7 @@ void LLViewerObject::unpackParticleSource(LLDataPacker &dp, const LLUUID& owner_
LLViewerTexture* image;
if (mPartSourcep->mPartSysData.mPartImageID == LLUUID::null)
{
image = LLViewerTextureManager::getFetchedTextureFromFile("pixiesmall.j2c");
image = LLViewerFetchedTexture::sDefaultParticleImagep;
}
else
{
Expand Down
8 changes: 4 additions & 4 deletions indra/newview/llviewerpartsource.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -114,7 +114,7 @@ LLViewerPartSourceScript::LLViewerPartSourceScript(LLViewerObject *source_objp)
llassert(source_objp);
mSourceObjectp = source_objp;
mPosAgent = mSourceObjectp->getPositionAgent();
mImagep = LLViewerTextureManager::getFetchedTextureFromFile("pixiesmall.j2c");
mImagep = LLViewerFetchedTexture::sDefaultParticleImagep;

mImagep->setAddressMode(LLTexUnit::TAM_CLAMP);
}
Expand Down Expand Up @@ -619,7 +619,7 @@ void LLViewerPartSourceSpiral::update(const F32 dt)
{
if (!mImagep)
{
mImagep = LLViewerTextureManager::getFetchedTextureFromFile("pixiesmall.j2c");
mImagep = LLViewerFetchedTexture::sDefaultParticleImagep;
}

const F32 RATE = 0.025f;
Expand Down Expand Up @@ -789,7 +789,7 @@ void LLViewerPartSourceBeam::update(const F32 dt)

if (!mImagep)
{
mImagep = LLViewerTextureManager::getFetchedTextureFromFile("pixiesmall.j2c");
mImagep = LLViewerFetchedTexture::sDefaultParticleImagep;
}

LLViewerPart* part = new LLViewerPart();
Expand Down Expand Up @@ -876,7 +876,7 @@ void LLViewerPartSourceChat::update(const F32 dt)
{
if (!mImagep)
{
mImagep = LLViewerTextureManager::getFetchedTextureFromFile("pixiesmall.j2c");
mImagep = LLViewerFetchedTexture::sDefaultParticleImagep;
}


Expand Down
1 change: 1 addition & 0 deletions indra/newview/llviewertexture.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -70,6 +70,7 @@ LLPointer<LLViewerTexture> LLViewerTexture::sBlackImagep = nullptr;
LLPointer<LLViewerTexture> LLViewerTexture::sCheckerBoardImagep = nullptr;
LLPointer<LLViewerFetchedTexture> LLViewerFetchedTexture::sMissingAssetImagep = nullptr;
LLPointer<LLViewerFetchedTexture> LLViewerFetchedTexture::sWhiteImagep = nullptr;
LLPointer<LLViewerFetchedTexture> LLViewerFetchedTexture::sDefaultParticleImagep = nullptr;
LLPointer<LLViewerFetchedTexture> LLViewerFetchedTexture::sDefaultImagep = nullptr;
LLPointer<LLViewerFetchedTexture> LLViewerFetchedTexture::sSmokeImagep = nullptr;
LLPointer<LLViewerFetchedTexture> LLViewerFetchedTexture::sFlatNormalImagep = nullptr;
Expand Down
1 change: 1 addition & 0 deletions indra/newview/llviewertexture.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -507,6 +507,7 @@ class LLViewerFetchedTexture : public LLViewerTexture
static LLPointer<LLViewerFetchedTexture> sDefaultImagep; // "Default" texture for error cases, the only case of fetched texture which is generated in local.
static LLPointer<LLViewerFetchedTexture> sFlatNormalImagep; // Flat normal map denoting no bumpiness on a surface
static LLPointer<LLViewerFetchedTexture> sDefaultIrradiancePBRp; // PBR: irradiance
static LLPointer<LLViewerFetchedTexture> sDefaultParticleImagep; // Default particle texture

// not sure why, but something is iffy about the loading of this particular texture, use the accessor instead of accessing directly
static LLPointer<LLViewerFetchedTexture> sSmokeImagep; // Old "Default" translucent texture
Expand Down
4 changes: 4 additions & 0 deletions indra/newview/llviewertexturelist.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -123,6 +123,9 @@ void LLViewerTextureList::doPreloadImages()
LLTexUnit::sWhiteTexture = LLViewerFetchedTexture::sWhiteImagep->getTexName();
LLUIImageList* image_list = LLUIImageList::getInstance();

// Set default particle texture
LLViewerFetchedTexture::sDefaultParticleImagep = LLViewerTextureManager::getFetchedTextureFromFile("pixiesmall.j2c");

// Set the default flat normal map
// BLANK_OBJECT_NORMAL has a version on dataserver, but it has compression artifacts
LLViewerFetchedTexture::sFlatNormalImagep =
Expand Down Expand Up @@ -403,6 +406,7 @@ LLViewerFetchedTexture* LLViewerTextureList::getImageFromFile(const std::string&
const LLUUID& force_id)
{
LL_PROFILE_ZONE_SCOPED_CATEGORY_TEXTURE;
LL_PROFILE_ZONE_TEXT(filename.c_str(), filename.size());
if(!mInitialized)
{
return NULL ;
Expand Down
Loading