diff --git a/indra/newview/llworld.cpp b/indra/newview/llworld.cpp
index a8fe79955b0030652765484961e6e9a8b17171e2..6b1e5cdd3c8528fa05e7e95e84308169c3005bea 100644
--- a/indra/newview/llworld.cpp
+++ b/indra/newview/llworld.cpp
@@ -79,20 +79,16 @@ const S32 OS_MAX_LINK_OBJECTS = 8191;	// Magic and arbitrary
 
 extern LLColor4U MAX_WATER_COLOR;
 
-U32 LLWorld::mWidth = 256;
-U32 LLWorld::mLength = 256;
-
-// meters/point, therefore mWidth * mScale = meters per edge
-const F32 LLWorld::mScale = 1.f;
-
-F32 LLWorld::mWidthInMeters = mWidth * mScale;
-
 //
 // Functions
 //
 
 // allocate the stack
 LLWorld::LLWorld() :
+	mWidth(256),
+	mLength(256),
+	mScale(1.f),
+	mWidthInMeters(mWidth * mScale),
 	mRefreshLimits(true),
 	mLandFarClip(DEFAULT_FAR_PLANE),
 	mLastPacketsIn(0),
diff --git a/indra/newview/llworld.h b/indra/newview/llworld.h
index af9e46974a5dd82bc50897b3ab776cabaf78e477..814c228b41974b7ed60f9c434c33dbe0f9c39249 100644
--- a/indra/newview/llworld.h
+++ b/indra/newview/llworld.h
@@ -227,13 +227,13 @@ class LLWorld final : public LLSimpleton<LLWorld>
 	region_remove_signal_t mRegionRemovedSignal;
 
 	// Number of points on edge
-	static U32 mWidth;
-	static U32 mLength;
+	U32 mWidth = 256;
+	U32 mLength = 256;
 
 	// meters/point, therefore mWidth * mScale = meters per edge
-	static const F32 mScale;
+	F32 mScale = 1.f;
 
-	static F32 mWidthInMeters;
+	F32 mWidthInMeters;
 	F32 mRegionMaxHeight;
 	F32 mRegionMinPrimScale;
 	F32 mRegionMaxPrimScale;
@@ -257,7 +257,7 @@ class LLWorld final : public LLSimpleton<LLWorld>
 	//
 
 	std::list<LLPointer<LLVOWater> > mHoleWaterObjects;
-    static const S32 EDGE_WATER_OBJECTS_COUNT = 8;
+    static constexpr S32 EDGE_WATER_OBJECTS_COUNT = 8;
     LLPointer<LLVOWater> mEdgeWaterObjects[EDGE_WATER_OBJECTS_COUNT];
 
 	LLPointer<LLViewerTexture> mDefaultWaterTexturep;