From 46d38204306f8b97e6ceecf89c5a70000455afec Mon Sep 17 00:00:00 2001
From: Drake Arconis <drake@alchemyviewer.org>
Date: Mon, 28 Mar 2016 22:53:13 -0400
Subject: [PATCH] CID-42847, CID-42854, CID-42886, CID-42921, CID-42922,
CID-42923, CID-42924, CID-42925, CID-42927, CID-42928, CID-83871, CID-83876,
CID-83878, CID-83880, CID-83900, CID-143573
---
indra/newview/llfloateravatartextures.cpp | 4 +++
indra/newview/llfloaterbulkpermission.cpp | 18 ++++++++--
indra/newview/llfloaterbulkpermission.h | 6 ----
indra/newview/llfloaterbuycurrencyhtml.cpp | 1 +
indra/newview/llfloaterbuyland.cpp | 36 ++++++++++++++++---
indra/newview/llfloaterbvhpreview.cpp | 10 +++---
indra/newview/llfloatercamera.cpp | 5 ++-
indra/newview/llfloatercolorpicker.cpp | 13 +++++++
.../newview/llfloaterconversationpreview.cpp | 5 +--
indra/newview/llfloaterdirectory.cpp | 20 ++++++-----
indra/newview/llfloaterfacebook.cpp | 25 ++++++++-----
indra/newview/llfloaterflickr.cpp | 26 +++++++-------
indra/newview/llmeshrepository.cpp | 1 +
indra/newview/llpanelaomini.cpp | 4 ++-
indra/newview/llspatialpartition.h | 2 --
indra/newview/llviewertexteditor.cpp | 1 +
16 files changed, 125 insertions(+), 52 deletions(-)
diff --git a/indra/newview/llfloateravatartextures.cpp b/indra/newview/llfloateravatartextures.cpp
index 11352b566f..ff03cbf06d 100755
--- a/indra/newview/llfloateravatartextures.cpp
+++ b/indra/newview/llfloateravatartextures.cpp
@@ -44,6 +44,10 @@ LLFloaterAvatarTextures::LLFloaterAvatarTextures(const LLSD& id)
: LLFloater(id),
mID(id.asUUID())
{
+ for (U32 i = 0; i < TEX_NUM_INDICES; i++)
+ {
+ mTextures[i] = nullptr;
+ }
}
LLFloaterAvatarTextures::~LLFloaterAvatarTextures()
diff --git a/indra/newview/llfloaterbulkpermission.cpp b/indra/newview/llfloaterbulkpermission.cpp
index 7b16264a2b..6b5af2eab2 100755
--- a/indra/newview/llfloaterbulkpermission.cpp
+++ b/indra/newview/llfloaterbulkpermission.cpp
@@ -52,8 +52,22 @@
LLFloaterBulkPermission::LLFloaterBulkPermission(const LLSD& seed)
-: LLFloater(seed),
- mDone(FALSE)
+ : LLFloater(seed),
+ mDone(FALSE),
+ mBulkChangeIncludeAnimations(false),
+ mBulkChangeIncludeBodyParts(false),
+ mBulkChangeIncludeClothing(false),
+ mBulkChangeIncludeGestures(false),
+ mBulkChangeIncludeNotecards(false),
+ mBulkChangeIncludeObjects(false),
+ mBulkChangeIncludeScripts(false),
+ mBulkChangeIncludeSounds(false),
+ mBulkChangeIncludeTextures(false),
+ mBulkChangeShareWithGroup(false),
+ mBulkChangeEveryoneCopy(false),
+ mBulkChangeNextOwnerModify(false),
+ mBulkChangeNextOwnerCopy(false),
+ mBulkChangeNextOwnerTransfer(false)
{
mID.generate();
mCommitCallbackRegistrar.add("BulkPermission.Ok", boost::bind(&LLFloaterBulkPermission::onOkBtn, this));
diff --git a/indra/newview/llfloaterbulkpermission.h b/indra/newview/llfloaterbulkpermission.h
index afd5f9f50b..1640cfcb17 100755
--- a/indra/newview/llfloaterbulkpermission.h
+++ b/indra/newview/llfloaterbulkpermission.h
@@ -85,10 +85,6 @@ private:
void doCheckUncheckAll(BOOL check);
private:
- // UI
- LLScrollListCtrl* mMessages;
- LLButton* mCloseBtn;
-
// Object Queue
std::vector<LLUUID> mObjectIDs;
LLUUID mCurrentObjectID;
@@ -110,8 +106,6 @@ private:
bool mBulkChangeNextOwnerTransfer;
LLUUID mID;
-
- const char* mStartString;
};
#endif
diff --git a/indra/newview/llfloaterbuycurrencyhtml.cpp b/indra/newview/llfloaterbuycurrencyhtml.cpp
index a69aa8d227..281d44e72f 100755
--- a/indra/newview/llfloaterbuycurrencyhtml.cpp
+++ b/indra/newview/llfloaterbuycurrencyhtml.cpp
@@ -34,6 +34,7 @@
//
LLFloaterBuyCurrencyHTML::LLFloaterBuyCurrencyHTML( const LLSD& key ):
LLFloater( key ),
+ mBrowser(nullptr),
mSpecificSumRequested( false ),
mMessage( "" ),
mSum( 0 )
diff --git a/indra/newview/llfloaterbuyland.cpp b/indra/newview/llfloaterbuyland.cpp
index 6595b82a21..cd58e0dc08 100755
--- a/indra/newview/llfloaterbuyland.cpp
+++ b/indra/newview/llfloaterbuyland.cpp
@@ -147,7 +147,8 @@ private:
{
TransactionPreflight,
TransactionCurrency,
- TransactionBuy
+ TransactionBuy,
+ TransactionNone
};
LLXMLRPCTransaction* mTransaction;
TransactionType mTransactionType;
@@ -278,13 +279,38 @@ LLFloater* LLFloaterBuyLand::buildFloater(const LLSD& key)
#pragma warning(disable : 4355)
#endif
LLFloaterBuyLandUI::LLFloaterBuyLandUI(const LLSD& key)
-: LLFloater(LLSD()),
+ : LLFloater(LLSD()),
mParcelSelectionObserver(this),
+ mRegion(nullptr),
mParcel(0),
+ mIsClaim(false),
+ mIsForGroup(false),
+ mCanBuy(false),
+ mCannotBuyIsError(false),
mBought(false),
- mParcelValid(false), mSiteValid(false),
- mChildren(*this), mCurrency(*this), mTransaction(0),
- mParcelBuyInfo(0)
+ mAgentCommittedTier(0),
+ mAgentCashBalance(0),
+ mAgentHasNeverOwnedLand(false),
+ mParcelValid(false),
+ mParcelIsForSale(false),
+ mParcelIsGroupLand(false),
+ mParcelGroupContribution(0),
+ mParcelPrice(0),
+ mParcelActualArea(0),
+ mParcelBillableArea(0),
+ mParcelSupportedObjects(0),
+ mParcelSoldWithObjects(false),
+ mUserPlanChoice(0),
+ mSiteValid(false),
+ mSiteMembershipUpgrade(false),
+ mSiteLandUseUpgrade(false),
+ mPreflightAskBillableArea(0),
+ mPreflightAskCurrencyBuy(0),
+ mChildren(*this),
+ mCurrency(*this),
+ mTransaction(nullptr),
+ mParcelBuyInfo(nullptr),
+ mTransactionType(TransactionNone)
{
LLViewerParcelMgr::getInstance()->addObserver(&mParcelSelectionObserver);
diff --git a/indra/newview/llfloaterbvhpreview.cpp b/indra/newview/llfloaterbvhpreview.cpp
index 2d7c5bf2b0..283f2dfe2a 100755
--- a/indra/newview/llfloaterbvhpreview.cpp
+++ b/indra/newview/llfloaterbvhpreview.cpp
@@ -81,11 +81,13 @@ const F32 BASE_ANIM_TIME_OFFSET = 5.f;
// LLFloaterBvhPreview()
//-----------------------------------------------------------------------------
LLFloaterBvhPreview::LLFloaterBvhPreview(const std::string& filename) :
- LLFloaterNameDesc(filename)
+ LLFloaterNameDesc(filename),
+ mLastMouseX(0),
+ mLastMouseY(0),
+ mPlayButton(nullptr),
+ mPauseButton(nullptr),
+ mStopButton(nullptr)
{
- mLastMouseX = 0;
- mLastMouseY = 0;
-
mIDList["Standing"] = ANIM_AGENT_STAND;
mIDList["Walking"] = ANIM_AGENT_FEMALE_WALK;
mIDList["Sitting"] = ANIM_AGENT_SIT_FEMALE;
diff --git a/indra/newview/llfloatercamera.cpp b/indra/newview/llfloatercamera.cpp
index 837e21edc8..d4273373ef 100755
--- a/indra/newview/llfloatercamera.cpp
+++ b/indra/newview/llfloatercamera.cpp
@@ -348,9 +348,12 @@ void LLFloaterCamera::onClose(bool app_quitting)
LLFloaterCamera::LLFloaterCamera(const LLSD& val)
: LLFloater(val),
+ mRotate(nullptr),
+ mZoom(nullptr),
+ mTrack(nullptr),
mClosed(FALSE),
- mCurrMode(CAMERA_CTRL_MODE_PAN),
mPrevMode(CAMERA_CTRL_MODE_PAN),
+ mCurrMode(CAMERA_CTRL_MODE_PAN),
mBtnCollapse(nullptr)
{
LLHints::registerHintTarget("view_popup", getHandle());
diff --git a/indra/newview/llfloatercolorpicker.cpp b/indra/newview/llfloatercolorpicker.cpp
index 1707c0da0b..f546912a50 100755
--- a/indra/newview/llfloatercolorpicker.cpp
+++ b/indra/newview/llfloatercolorpicker.cpp
@@ -69,6 +69,15 @@
LLFloaterColorPicker::LLFloaterColorPicker (LLColorSwatchCtrl* swatch, BOOL show_apply_immediate )
: LLFloater(LLSD()),
+ origR(1.f),
+ origG(1.f),
+ origB(1.f),
+ curR(1.f),
+ curG(1.f),
+ curB(1.f),
+ curH(0.f),
+ curS(0.f),
+ curL(1.f),
mComponents ( 3 ),
mMouseDownInLumRegion ( FALSE ),
mMouseDownInHueRegion ( FALSE ),
@@ -99,7 +108,11 @@ LLFloaterColorPicker::LLFloaterColorPicker (LLColorSwatchCtrl* swatch, BOOL show
mPaletteRegionHeight ( 40 ),
mSwatch ( swatch ),
mActive ( TRUE ),
+ mApplyImmediateCheck(nullptr),
mCanApplyImmediately ( show_apply_immediate ),
+ mSelectBtn(nullptr),
+ mCancelBtn(nullptr),
+ mPipetteBtn(nullptr),
mContextConeOpacity ( 0.f ),
mContextConeInAlpha ( 0.f ),
mContextConeOutAlpha ( 0.f ),
diff --git a/indra/newview/llfloaterconversationpreview.cpp b/indra/newview/llfloaterconversationpreview.cpp
index 5b840c9c0d..0ac3d89367 100755
--- a/indra/newview/llfloaterconversationpreview.cpp
+++ b/indra/newview/llfloaterconversationpreview.cpp
@@ -39,7 +39,8 @@ const std::string LL_FCP_ACCOUNT_NAME("user_name");
LLFloaterConversationPreview::LLFloaterConversationPreview(const LLSD& session_id)
: LLFloater(session_id),
- mChatHistory(NULL),
+ mPageSpinner(nullptr),
+ mChatHistory(nullptr),
mSessionID(session_id.asUUID()),
mCurrentPage(0),
mPageSize(gSavedSettings.getS32("ConversationHistoryPageSize")),
@@ -47,7 +48,7 @@ LLFloaterConversationPreview::LLFloaterConversationPreview(const LLSD& session_i
mCompleteName(session_id[LL_FCP_COMPLETE_NAME]),
mMutex(),
mShowHistory(false),
- mMessages(NULL),
+ mMessages(nullptr),
mHistoryThreadsBusy(false),
mOpened(false)
{
diff --git a/indra/newview/llfloaterdirectory.cpp b/indra/newview/llfloaterdirectory.cpp
index ba4ad65e55..744b2ea031 100644
--- a/indra/newview/llfloaterdirectory.cpp
+++ b/indra/newview/llfloaterdirectory.cpp
@@ -61,15 +61,17 @@ static const std::array<std::string, 6> sSearchPanels{ {"panel_search_people", "
static const std::array<std::string, 5> sDetailPanels{ {"detail_avatar", "detail_group", "detail_place", "detail_classified", "detail_event"} };
LLFloaterDirectory::LLFloaterDirectory(const Params& key)
-: LLFloater(key)
-, mQueryID(LLUUID())
-, mResultStart(0)
-, mNumResultsReceived(0)
-, mResultList(nullptr)
-, mTabContainer(nullptr)
-, mPanelWeb(nullptr)
-, mCurrentQuery()
-, mCurrentResultType(SE_UNDEFINED)
+ : LLFloater(key)
+ , mCurrentResultType(SE_UNDEFINED)
+ , mCurrentQuery()
+ , mResultStart(0)
+ , mNumResultsReceived(0)
+ , mQueryID()
+ , mTabContainer(nullptr)
+ , mDetailPeople(nullptr)
+ , mPanelWeb(nullptr)
+ , mResultList(nullptr)
+ , mResultsStatus(nullptr)
{
}
diff --git a/indra/newview/llfloaterfacebook.cpp b/indra/newview/llfloaterfacebook.cpp
index 738d6073e3..e70ea1144e 100644
--- a/indra/newview/llfloaterfacebook.cpp
+++ b/indra/newview/llfloaterfacebook.cpp
@@ -322,14 +322,16 @@ void LLFacebookStatusPanel::clearAndClose()
///////////////////////////
LLFacebookPhotoPanel::LLFacebookPhotoPanel() :
-mResolutionComboBox(NULL),
-mRefreshBtn(NULL),
-mBtnPreview(NULL),
-mWorkingLabel(NULL),
-mThumbnailPlaceholder(NULL),
-mCaptionTextBox(NULL),
-mPostButton(NULL),
-mBigPreviewFloater(NULL),
+mResolutionComboBox(nullptr),
+mFilterComboBox(nullptr),
+mRefreshBtn(nullptr),
+mCancelButton(nullptr),
+mBtnPreview(nullptr),
+mWorkingLabel(nullptr),
+mThumbnailPlaceholder(nullptr),
+mCaptionTextBox(nullptr),
+mPostButton(nullptr),
+mBigPreviewFloater(nullptr),
mQuality(MAX_QUALITY)
{
mCommitCallbackRegistrar.add("SocialSharing.SendPhoto", boost::bind(&LLFacebookPhotoPanel::onSend, this));
@@ -708,6 +710,13 @@ LLUICtrl* LLFacebookPhotoPanel::getRefreshBtn()
LLFacebookCheckinPanel::LLFacebookCheckinPanel() :
mMapUrl(""),
+ mPostButton(nullptr),
+ mCancelButton(nullptr),
+ mMessageTextEditor(nullptr),
+ mMapLoadingIndicator(nullptr),
+ mMapPlaceholder(nullptr),
+ mMapDefault(nullptr),
+ mMapCheckBox(nullptr),
mReloadingMapTexture(false)
{
mCommitCallbackRegistrar.add("SocialSharing.SendCheckin", boost::bind(&LLFacebookCheckinPanel::onSend, this));
diff --git a/indra/newview/llfloaterflickr.cpp b/indra/newview/llfloaterflickr.cpp
index 5ee6df1491..b6682a3bb3 100644
--- a/indra/newview/llfloaterflickr.cpp
+++ b/indra/newview/llfloaterflickr.cpp
@@ -64,18 +64,20 @@ const char* FLICKR_MACHINE_TAGS_NAMESPACE = "secondlife";
///////////////////////////
LLFlickrPhotoPanel::LLFlickrPhotoPanel() :
-mResolutionComboBox(NULL),
-mRefreshBtn(NULL),
-mBtnPreview(NULL),
-mWorkingLabel(NULL),
-mThumbnailPlaceholder(NULL),
-mTitleTextBox(NULL),
-mDescriptionTextBox(NULL),
-mLocationCheckbox(NULL),
-mTagsTextBox(NULL),
-mRatingComboBox(NULL),
-mBigPreviewFloater(NULL),
-mPostButton(NULL)
+mResolutionComboBox(nullptr),
+mFilterComboBox(nullptr),
+mRefreshBtn(nullptr),
+mCancelButton(nullptr),
+mBtnPreview(nullptr),
+mWorkingLabel(nullptr),
+mThumbnailPlaceholder(nullptr),
+mTitleTextBox(nullptr),
+mDescriptionTextBox(nullptr),
+mLocationCheckbox(nullptr),
+mTagsTextBox(nullptr),
+mRatingComboBox(nullptr),
+mBigPreviewFloater(nullptr),
+mPostButton(nullptr)
{
mCommitCallbackRegistrar.add("SocialSharing.SendPhoto", boost::bind(&LLFlickrPhotoPanel::onSend, this));
mCommitCallbackRegistrar.add("SocialSharing.RefreshPhoto", boost::bind(&LLFlickrPhotoPanel::onClickNewSnapshot, this));
diff --git a/indra/newview/llmeshrepository.cpp b/indra/newview/llmeshrepository.cpp
index 7eceb8161f..527fd51b10 100755
--- a/indra/newview/llmeshrepository.cpp
+++ b/indra/newview/llmeshrepository.cpp
@@ -3255,6 +3255,7 @@ LLMeshRepository::LLMeshRepository()
: mMeshMutex(NULL),
mMeshThreadCount(0),
mThread(NULL),
+ mDecompThread(nullptr),
mGetMeshVersion(2)
{
diff --git a/indra/newview/llpanelaomini.cpp b/indra/newview/llpanelaomini.cpp
index fa3d64dfe0..7545ffe079 100644
--- a/indra/newview/llpanelaomini.cpp
+++ b/indra/newview/llpanelaomini.cpp
@@ -38,7 +38,9 @@
static LLPanelInjector<LLPanelAOMini> t_ao_mini("ao_mini");
-LLPanelAOMini::LLPanelAOMini()
+LLPanelAOMini::LLPanelAOMini()
+ : LLPanel()
+ , mSetList(nullptr)
{
mCommitCallbackRegistrar.add("AO.SitOverride", boost::bind(&LLPanelAOMini::onClickSit, this, _2));
mCommitCallbackRegistrar.add("AO.NextAnim", boost::bind(&LLPanelAOMini::onClickNext, this));
diff --git a/indra/newview/llspatialpartition.h b/indra/newview/llspatialpartition.h
index b2449840bf..c7876defd4 100755
--- a/indra/newview/llspatialpartition.h
+++ b/indra/newview/llspatialpartition.h
@@ -110,9 +110,7 @@ public:
U32 mBlendFuncDst;
BOOL mHasGlow;
LLPointer<LLViewerTexture> mSpecularMap;
- const LLMatrix4* mSpecularMapMatrix;
LLPointer<LLViewerTexture> mNormalMap;
- const LLMatrix4* mNormalMapMatrix;
LLVector4 mSpecColor; // XYZ = Specular RGB, W = Specular Exponent
F32 mEnvIntensity;
F32 mAlphaMaskCutoff;
diff --git a/indra/newview/llviewertexteditor.cpp b/indra/newview/llviewertexteditor.cpp
index 6f204cb309..f2cb1fec10 100755
--- a/indra/newview/llviewertexteditor.cpp
+++ b/indra/newview/llviewertexteditor.cpp
@@ -660,6 +660,7 @@ struct LLNotecardCopyInfo
//
LLViewerTextEditor::LLViewerTextEditor(const LLViewerTextEditor::Params& p)
: LLTextEditor(p),
+ mDragSegment(nullptr),
mDragItemChar(0),
mDragItemSaved(FALSE),
mInventoryCallback(new LLEmbeddedNotecardOpener)
--
GitLab