CID-388

Checker: UNINIT_CTOR
Function: LLPanelPlaceInfo::LLPanelPlaceInfo()
File: /indra/newview/llpanelplaceinfo.cpp

6 files changed, 11 insertions, 8 deletions

diff --git a/indra/newview/llpanellandmarkinfo.cpp b/indra/newview/llpanellandmarkinfo.cpp
index c792fd4fe3..7a17d4a1f0 100644
--- a/indra/newview/llpanellandmarkinfo.cpp
+++ b/indra/newview/llpanellandmarkinfo.cpp
@@ -108,7 +108,7 @@ void LLPanelLandmarkInfo::resetLocation()
 }
 
 // virtual
-void LLPanelLandmarkInfo::setInfoType(INFO_TYPE type)
+void LLPanelLandmarkInfo::setInfoType(EInfoType type)
 {
 	LLPanel* landmark_info_panel = getChild<LLPanel>("landmark_info_panel");
 
diff --git a/indra/newview/llpanellandmarkinfo.h b/indra/newview/llpanellandmarkinfo.h
index 2a9949ae41..b3dc3f5ad9 100644
--- a/indra/newview/llpanellandmarkinfo.h
+++ b/indra/newview/llpanellandmarkinfo.h
@@ -49,7 +49,7 @@ public:
 
 	/*virtual*/ void resetLocation();
 
-	/*virtual*/ void setInfoType(INFO_TYPE type);
+	/*virtual*/ void setInfoType(EInfoType type);
 
 	/*virtual*/ void processParcelInfo(const LLParcelData& parcel_data);
 
diff --git a/indra/newview/llpanelplaceinfo.cpp b/indra/newview/llpanelplaceinfo.cpp
index 5f75668722..9ebc8ca2b9 100644
--- a/indra/newview/llpanelplaceinfo.cpp
+++ b/indra/newview/llpanelplaceinfo.cpp
@@ -58,6 +58,7 @@ LLPanelPlaceInfo::LLPanelPlaceInfo()
 	mPosRegion(),
 	mScrollingPanelMinHeight(0),
 	mScrollingPanelWidth(0),
+	mInfoType(UNKNOWN),
 	mScrollingPanel(NULL),
 	mScrollContainer(NULL)
 {}
@@ -120,7 +121,7 @@ void LLPanelPlaceInfo::setParcelID(const LLUUID& parcel_id)
 }
 
 //virtual
-void LLPanelPlaceInfo::setInfoType(INFO_TYPE type)
+void LLPanelPlaceInfo::setInfoType(EInfoType type)
 {
 	mTitle->setText(mCurrentTitle);
 
diff --git a/indra/newview/llpanelplaceinfo.h b/indra/newview/llpanelplaceinfo.h
index 3091f7ed24..deedbd2b0f 100644
--- a/indra/newview/llpanelplaceinfo.h
+++ b/indra/newview/llpanelplaceinfo.h
@@ -54,8 +54,10 @@ class LLViewerInventoryCategory;
 class LLPanelPlaceInfo : public LLPanel, LLRemoteParcelInfoObserver
 {
 public:
-	enum INFO_TYPE
+	enum EInfoType
 	{
+		UNKNOWN,
+
 		AGENT,
 		CREATE_LANDMARK,
 		LANDMARK,
@@ -79,7 +81,7 @@ public:
 	// Depending on how the panel was triggered
 	// (from landmark or current location, or other)
 	// sets a corresponding title and contents.
-	virtual void setInfoType(INFO_TYPE type);
+	virtual void setInfoType(EInfoType type);
 
 	// Requests remote parcel info by parcel ID.
 	void sendParcelInfoRequest();
@@ -114,7 +116,7 @@ protected:
 	std::string				mCurrentTitle;
 	S32						mScrollingPanelMinHeight;
 	S32						mScrollingPanelWidth;
-	INFO_TYPE 				mInfoType;
+	EInfoType 				mInfoType;
 
 	LLScrollContainer*		mScrollContainer;
 	LLPanel*				mScrollingPanel;
diff --git a/indra/newview/llpanelplaceprofile.cpp b/indra/newview/llpanelplaceprofile.cpp
index 3c798639d4..8d689b2c5e 100644
--- a/indra/newview/llpanelplaceprofile.cpp
+++ b/indra/newview/llpanelplaceprofile.cpp
@@ -207,7 +207,7 @@ void LLPanelPlaceProfile::resetLocation()
 }
 
 // virtual
-void LLPanelPlaceProfile::setInfoType(INFO_TYPE type)
+void LLPanelPlaceProfile::setInfoType(EInfoType type)
 {
 	bool is_info_type_agent = type == AGENT;
 
diff --git a/indra/newview/llpanelplaceprofile.h b/indra/newview/llpanelplaceprofile.h
index 8ca9526875..e77b441567 100644
--- a/indra/newview/llpanelplaceprofile.h
+++ b/indra/newview/llpanelplaceprofile.h
@@ -48,7 +48,7 @@ public:
 
 	/*virtual*/ void resetLocation();
 
-	/*virtual*/ void setInfoType(INFO_TYPE type);
+	/*virtual*/ void setInfoType(EInfoType type);
 
 	/*virtual*/ void processParcelInfo(const LLParcelData& parcel_data);