Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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/llui/llfloater.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -270,6 +270,7 @@ LLFloater::LLFloater(const LLSD& key, const LLFloater::Params& p)
mTitle(p.title),
mShortTitle(p.short_title),
mSingleInstance(p.single_instance),
mIsReuseInitialized(p.reuse_instance.isProvided()),
mReuseInstance(p.reuse_instance.isProvided() ? p.reuse_instance : p.single_instance), // reuse single-instance floaters by default
mKey(key),
mCanTearOff(p.can_tear_off),
Expand Down Expand Up @@ -3515,6 +3516,7 @@ void LLFloater::initFromParams(const LLFloater::Params& p)
mHeaderHeight = p.header_height;
mLegacyHeaderHeight = p.legacy_header_height;
mSingleInstance = p.single_instance;
mIsReuseInitialized = p.reuse_instance.isProvided();
mReuseInstance = p.reuse_instance.isProvided() ? p.reuse_instance : p.single_instance;

mDefaultRelativeX = p.rel_x;
Expand Down
6 changes: 1 addition & 5 deletions indra/newview/llfloateruipreview.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -702,13 +702,9 @@ void LLFloaterUIPreview::refreshList()
// Note: no deduplification (shouldn't be necessary)
void LLFloaterUIPreview::addFloaterEntry(const std::string& path)
{
LLUUID* entry_id = new LLUUID(); // create a new UUID
entry_id->generate(path);
const LLUUID& entry_id_ref = *entry_id; // get a reference to the UUID for the LLSD block

// fill LLSD column entry: initialize row/col structure
LLSD row;
row["id"] = entry_id_ref;
row["id"] = LLUUID::generateNewID(path); // create a new UUID
LLSD& columns = row["columns"];

// Get name of floater:
Expand Down
1 change: 1 addition & 0 deletions indra/newview/llinventorygallery.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -2768,6 +2768,7 @@ static LLDefaultChildRegistry::Register<LLInventoryGalleryItem> r("inventory_gal
LLInventoryGalleryItem::LLInventoryGalleryItem(const Params& p)
: LLPanel(p),
mSelected(false),
mWorn(false),
mDefaultImage(true),
mItemName(""),
mWornSuffix(""),
Expand Down
2 changes: 1 addition & 1 deletion indra/newview/lllocationinputctrl.h
Original file line number Diff line number Diff line change
Expand Up @@ -210,7 +210,7 @@ class LLLocationInputCtrl
std::string mEditLandmarkTooltip;
// this field holds a human-readable form of the location string, it is needed to be able to compare copy-pated value and real location
std::string mHumanReadableLocation;
bool isHumanReadableLocationVisible;
bool isHumanReadableLocationVisible = true;
std::string mMaturityHelpTopic;
};

Expand Down
4 changes: 0 additions & 4 deletions indra/newview/llmediactrl.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -1030,10 +1030,6 @@ void LLMediaCtrl::handleMediaEvent(LLPluginClassMedia* self, EMediaEvent event)
case MEDIA_EVENT_NAVIGATE_COMPLETE:
{
LL_DEBUGS("Media") << "Media event: MEDIA_EVENT_NAVIGATE_COMPLETE, result string is: " << self->getNavigateResultString() << LL_ENDL;
if(mHidingInitialLoad)
{
mHidingInitialLoad = false;
}
};
break;

Expand Down
1 change: 0 additions & 1 deletion indra/newview/llmediactrl.h
Original file line number Diff line number Diff line change
Expand Up @@ -202,7 +202,6 @@ class LLMediaCtrl :
mStretchToFill,
mMaintainAspectRatio,
mHideLoading,
mHidingInitialLoad,
mClearCache,
mHoverTextChanged,
mDecoupleTextureSize,
Expand Down
4 changes: 2 additions & 2 deletions indra/newview/llmodelpreview.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -3637,7 +3637,7 @@ bool LLModelPreview::render()
LLPhysicsDecomp* decomp = gMeshRepo.mDecompThread;
if (decomp)
{
LLMutexLock(decomp->mMutex);
LLMutexLock decomp_lock(decomp->mMutex);

LLModel::Decomposition& physics = model->mPhysics;

Expand Down Expand Up @@ -3758,7 +3758,7 @@ bool LLModelPreview::render()
LLPhysicsDecomp* decomp = gMeshRepo.mDecompThread;
if (decomp)
{
LLMutexLock(decomp->mMutex);
LLMutexLock decomp_lock(decomp->mMutex);

LLModel::Decomposition& physics = model->mPhysics;

Expand Down
1 change: 1 addition & 0 deletions indra/newview/llnetmap.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -105,6 +105,7 @@ LLNetMap::LLNetMap (const Params & p)
mPopupWorldPos(0.f, 0.f, 0.f),
mMouseDown(0, 0),
mPanning(false),
mCentering(false),
mObjectImageCenterGlobal( gAgentCamera.getCameraPositionGlobal() ),
mObjectRawImagep(),
mObjectImagep(),
Expand Down
1 change: 0 additions & 1 deletion indra/newview/llreflectionmapmanager.h
Original file line number Diff line number Diff line change
Expand Up @@ -269,7 +269,6 @@ class alignas(16) LLReflectionMapManager
bool mReset = false;

float mResetFade = 1.f;
float mGlobalFadeTarget = 1.f;

// if true, only update the default probe
bool mPaused = false;
Expand Down
6 changes: 3 additions & 3 deletions indra/newview/llscrollingpanelparambase.h
Original file line number Diff line number Diff line change
Expand Up @@ -53,11 +53,11 @@ class LLScrollingPanelParamBase : public LLScrollingPanel
F32 percentToWeight( F32 percent );

public:
LLViewerVisualParam* mParam;
LLViewerVisualParam* mParam = nullptr;
protected:
LLUICtrl* mParamSlider = nullptr;
bool mAllowModify;
LLWearable *mWearable;
bool mAllowModify = false;
LLWearable *mWearable = nullptr;
};

#endif
11 changes: 5 additions & 6 deletions indra/newview/llviewertexturelist.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -1400,6 +1400,11 @@ bool LLViewerTextureList::createUploadFile(LLPointer<LLImageRaw> raw_image,
raw_image->getComponents());

LLPointer<LLImageJ2C> compressedImage = LLViewerTextureList::convertToUploadFile(scale_image, max_image_dimentions);
if (compressedImage.isNull())
{
LL_INFOS() << "Couldn't convert to j2c, file : " << out_filename << LL_ENDL;
return false;
}
if (compressedImage->getWidth() < min_image_dimentions || compressedImage->getHeight() < min_image_dimentions)
{
std::string reason = llformat("Images below %d x %d pixels are not allowed. Actual size: %d x %dpx",
Expand All @@ -1410,12 +1415,6 @@ bool LLViewerTextureList::createUploadFile(LLPointer<LLImageRaw> raw_image,
compressedImage->setLastError(reason);
return false;
}
if (compressedImage.isNull())
{
compressedImage->setLastError("Couldn't convert the image to jpeg2000.");
LL_INFOS() << "Couldn't convert to j2c, file : " << out_filename << LL_ENDL;
return false;
}
if (!compressedImage->save(out_filename))
{
compressedImage->setLastError("Couldn't create the jpeg2000 image for upload.");
Expand Down
4 changes: 2 additions & 2 deletions indra/newview/llvoavatar.h
Original file line number Diff line number Diff line change
Expand Up @@ -1028,7 +1028,7 @@ class LLVOAvatar :
void startTyping() { mTyping = true; mTypingTimer.reset(); }
void stopTyping() { mTyping = false; }
private:
bool mVisibleChat;
bool mVisibleChat = false;

//--------------------------------------------------------------------
// Lip synch morphs
Expand Down Expand Up @@ -1211,7 +1211,7 @@ class LLVOAvatar :
static F32 sGreyUpdateTime; // Last time stats were updated (to prevent multiple updates per frame)
protected:
S32 getUnbakedPixelAreaRank();
bool mHasGrey;
bool mHasGrey = false;
private:
F32 mMinPixelArea;
F32 mMaxPixelArea;
Expand Down
Loading