merge svn+ssh://svn.lindenlab.com/svn/linden/qa/combo-merge-ui-2008-02-13 -r 79986 : 80178 -> release.

QAR-290 = QAR-271 + QAR-191

1 files changed, 18 insertions, 15 deletions

diff --git a/indra/newview/llstatusbar.h b/indra/newview/llstatusbar.h
index 78f744c4b5..0605246f16 100644
--- a/indra/newview/llstatusbar.h
+++ b/indra/newview/llstatusbar.h
@@ -51,30 +51,33 @@ class LLStatGraph;
 class LLRegionDetails
 {
 public:
-	LLRegionDetails()
+	LLRegionDetails() :
+		mRegionName("Unknown"),
+		mParcelName("Unknown"),
+		mAccesString("Unknown"),
+		mX(0),
+		mY(0),
+		mZ(0),
+		mArea (0),
+		mForSale(FALSE),
+		mOwner("Unknown"),
+		mTraffic(0),
+		mBalance(0),
+		mPing(0)
 	{
-		mRegionName = LLString("Unknown");
-		mParcelName = "Unknown";
-		mAccesString = "Unknown";
-		mX = 0;
-		mY = 0;
-		mZ = 0;
-		mArea = 0;
-		mForSale = FALSE;
-		snprintf(mOwner, MAX_STRING, "Unknown");
 	}
-	LLString mRegionName;
-	char	*mParcelName;
-	char	*mAccesString;
+	std::string mRegionName;
+	std::string	mParcelName;
+	std::string	mAccesString;
 	S32		mX;
 	S32		mY;
 	S32		mZ;
 	S32		mArea;
 	BOOL	mForSale;
-	char	mOwner[MAX_STRING];
+	std::string	mOwner;
 	F32		mTraffic;
 	S32		mBalance;
-	LLString	mTime;
+	std::string mTime;
 	U32		mPing;
 };