From ee86a65f0450003689dcd0d52c726c876456dd28 Mon Sep 17 00:00:00 2001
From: Tofu Linden <tofu.linden@lindenlab.com>
Date: Thu, 28 Jan 2010 11:07:02 -0800
Subject: [PATCH] CID-372
Checker: UNINIT_CTOR
Function: LLViewerJoint::LLViewerJoint(const std::basic_string<char, std::char_traits<char>, std::allocator<char>>&, LLJoint *)
File: /indra/newview/llviewerjoint.cpp
CID-377
Checker: UNINIT_CTOR
Function: LLOfferInfo::LLOfferInfo()
File: /indra/newview/llviewermessage.h
---
indra/newview/llviewerjoint.cpp | 21 ++++++++++++---------
indra/newview/llviewermessage.h | 4 +++-
2 files changed, 15 insertions(+), 10 deletions(-)
diff --git a/indra/newview/llviewerjoint.cpp b/indra/newview/llviewerjoint.cpp
index c425d95ff80..f5192914f41 100644
--- a/indra/newview/llviewerjoint.cpp
+++ b/indra/newview/llviewerjoint.cpp
@@ -59,14 +59,9 @@ BOOL LLViewerJoint::sDisableLOD = FALSE;
// Class Constructor
//-----------------------------------------------------------------------------
LLViewerJoint::LLViewerJoint()
+ : LLJoint()
{
- mUpdateXform = TRUE;
- mValid = FALSE;
- mComponents = SC_JOINT | SC_BONE | SC_AXES;
- mMinPixelArea = DEFAULT_LOD;
- mPickName = PN_DEFAULT;
- mVisible = TRUE;
- mMeshID = 0;
+ init();
}
@@ -74,13 +69,21 @@ LLViewerJoint::LLViewerJoint()
// LLViewerJoint()
// Class Constructor
//-----------------------------------------------------------------------------
-LLViewerJoint::LLViewerJoint(const std::string &name, LLJoint *parent) :
- LLJoint(name, parent)
+LLViewerJoint::LLViewerJoint(const std::string &name, LLJoint *parent)
+ : LLJoint(name, parent)
+{
+ init();
+}
+
+
+LLViewerJoint::init()
{
mValid = FALSE;
mComponents = SC_JOINT | SC_BONE | SC_AXES;
mMinPixelArea = DEFAULT_LOD;
mPickName = PN_DEFAULT;
+ mVisible = TRUE;
+ mMeshID = 0;
}
diff --git a/indra/newview/llviewermessage.h b/indra/newview/llviewermessage.h
index 8404d6fde02..1415c16090e 100644
--- a/indra/newview/llviewermessage.h
+++ b/indra/newview/llviewermessage.h
@@ -205,7 +205,9 @@ void open_inventory_offer(const std::vector<LLUUID>& items, const std::string& f
struct LLOfferInfo
{
- LLOfferInfo() {};
+ LLOfferInfo()
+ : mFromGroup(FALSE), mFromObject(FALSE),
+ mIM(IM_NOTHING_SPECIAL), mType(LLAssetType::AT_NONE) {};
LLOfferInfo(const LLSD& sd);
void forceResponse(InventoryOfferResponse response);
--
GitLab