storm-1189: remove classic clouds

14 files changed, 15 insertions, 89 deletions

diff --git a/indra/newview/CMakeLists.txt b/indra/newview/CMakeLists.txt
index 5f0a7f5b66..5a9ee92b0c 100644
--- a/indra/newview/CMakeLists.txt
+++ b/indra/newview/CMakeLists.txt
@@ -119,7 +119,6 @@ set(viewer_SOURCE_FILES
     llchiclet.cpp
     llclassifiedinfo.cpp
     llclassifiedstatsresponder.cpp
-    llcloud.cpp
     llcofwearables.cpp
     llcolorswatch.cpp
     llcommanddispatcherlistener.cpp
@@ -672,7 +671,6 @@ set(viewer_HEADER_FILES
     llchiclet.h
     llclassifiedinfo.h
     llclassifiedstatsresponder.h
-    llcloud.h
     llcofwearables.h
     llcolorswatch.h
     llcommanddispatcherlistener.h
diff --git a/indra/newview/app_settings/settings.xml b/indra/newview/app_settings/settings.xml
index a3b8ee177a..d1d64516f9 100644
--- a/indra/newview/app_settings/settings.xml
+++ b/indra/newview/app_settings/settings.xml
@@ -10187,17 +10187,6 @@
         <real>0.1</real>
       </array>
     </map>
-    <key>SkyUseClassicClouds</key>
-    <map>
-      <key>Comment</key>
-      <string>Whether to use the old Second Life particle clouds or not</string>
-      <key>Persist</key>
-      <integer>1</integer>
-      <key>Type</key>
-      <string>Boolean</string>
-      <key>Value</key>
-      <integer>1</integer>
-    </map>
     <key>SnapEnabled</key>
     <map>
       <key>Comment</key>
diff --git a/indra/newview/featuretable.txt b/indra/newview/featuretable.txt
index dd8a88e558..9cc6893b15 100644
--- a/indra/newview/featuretable.txt
+++ b/indra/newview/featuretable.txt
@@ -59,7 +59,6 @@ Disregard96DefaultDrawDistance	1	1
 RenderTextureMemoryMultiple		1	1.0
 RenderShaderLightingMaxLevel	1	3
 RenderDeferred				1	1
-SkyUseClassicClouds			1	1
 RenderDeferredSSAO			1	1
 RenderShadowDetail			1	2
 WatchdogDisabled				1	1
@@ -91,7 +90,6 @@ RenderVolumeLODFactor		1	0.5
 VertexShaderEnable			1	0
 WindLightUseAtmosShaders	1	0
 WLSkyDetail					1	48
-SkyUseClassicClouds			1	0
 RenderDeferred				1	0
 RenderDeferredSSAO			1	0
 RenderShadowDetail			1	0
diff --git a/indra/newview/featuretable_linux.txt b/indra/newview/featuretable_linux.txt
index 058bdcc730..1aa6314246 100644
--- a/indra/newview/featuretable_linux.txt
+++ b/indra/newview/featuretable_linux.txt
@@ -57,7 +57,6 @@ WLSkyDetail					1	128
 Disregard128DefaultDrawDistance	1	1
 Disregard96DefaultDrawDistance	1	1
 RenderTextureMemoryMultiple		1	1.0
-SkyUseClassicClouds			1	1
 RenderShaderLightingMaxLevel		1	3
 RenderDeferred				1	1
 RenderDeferredSSAO			1	1
@@ -89,7 +88,6 @@ RenderVolumeLODFactor		1	0.5
 VertexShaderEnable			1	0
 WindLightUseAtmosShaders	1	0
 WLSkyDetail					1	48
-SkyUseClassicClouds			1	0
 RenderDeferred				1	0
 RenderDeferredSSAO			1	0
 RenderShadowDetail			1	0
diff --git a/indra/newview/featuretable_mac.txt b/indra/newview/featuretable_mac.txt
index c075c660f3..9a8e4d04be 100644
--- a/indra/newview/featuretable_mac.txt
+++ b/indra/newview/featuretable_mac.txt
@@ -58,7 +58,6 @@ Disregard128DefaultDrawDistance	1	1
 Disregard96DefaultDrawDistance	1	1
 RenderTextureMemoryMultiple		1	0.5
 RenderShaderLightingMaxLevel	1	3
-SkyUseClassicClouds			1	1
 RenderDeferred				1	1
 RenderDeferredSSAO			1	1
 RenderShadowDetail			1	2
@@ -91,7 +90,6 @@ RenderVolumeLODFactor		1	0.5
 VertexShaderEnable			1	0
 WindLightUseAtmosShaders	1	0
 WLSkyDetail					1	48
-SkyUseClassicClouds			1	0
 RenderDeferred				1	0
 RenderDeferredSSAO			1	0
 RenderShadowDetail			1	0
diff --git a/indra/newview/featuretable_xp.txt b/indra/newview/featuretable_xp.txt
index 3339172a1a..9b9e1f6ead 100644
--- a/indra/newview/featuretable_xp.txt
+++ b/indra/newview/featuretable_xp.txt
@@ -58,7 +58,6 @@ Disregard128DefaultDrawDistance	1	1
 Disregard96DefaultDrawDistance	1	1
 RenderTextureMemoryMultiple		1	1.0
 RenderShaderLightingMaxLevel	1	3
-SkyUseClassicClouds			1	1
 RenderDeferred				1	0
 RenderDeferredSSAO			1	0
 RenderShadowDetail			1	0
@@ -91,7 +90,6 @@ RenderVolumeLODFactor		1	0.5
 VertexShaderEnable			1	0
 WindLightUseAtmosShaders	1	0
 WLSkyDetail					1	48
-SkyUseClassicClouds			1	0
 RenderDeferred				1	0
 RenderDeferredSSAO			1	0
 RenderShadowDetail			1	0
diff --git a/indra/newview/llappviewer.cpp b/indra/newview/llappviewer.cpp
index 84db514ecf..f6fba3cbc4 100644
--- a/indra/newview/llappviewer.cpp
+++ b/indra/newview/llappviewer.cpp
@@ -1,4 +1,4 @@
-	/** 
+/** 
  * @file llappviewer.cpp
  * @brief The LLAppViewer class definitions
  *
@@ -4311,7 +4311,6 @@ void LLAppViewer::idle()
 	//
 	// Update weather effects
 	//
-	LLWorld::getInstance()->updateClouds(gFrameDTClamped);
 	gSky.propagateHeavenlyBodies(gFrameDTClamped);				// moves sun, moon, and planets
 
 	// Update wind vector 
@@ -4327,9 +4326,6 @@ void LLAppViewer::idle()
 		// Compute average wind and use to drive motion of water
 		
 		average_wind = regionp->mWind.getAverage();
-		F32 cloud_density = regionp->mCloudLayer.getDensityRegion(wind_position_region);
-		
-		gSky.setCloudDensityAtAgent(cloud_density);
 		gSky.setWind(average_wind);
 		//LLVOWater::setWind(average_wind);
 	}
diff --git a/indra/newview/llfloaterwindlight.cpp b/indra/newview/llfloaterwindlight.cpp
index b90f576555..fb69e6f594 100644
--- a/indra/newview/llfloaterwindlight.cpp
+++ b/indra/newview/llfloaterwindlight.cpp
@@ -180,8 +180,6 @@ void LLFloaterWindLight::initCallbacks(void)
 	childSetCommitCallback("WLCloudDetailDensity", onColorControlBMoved, &param_mgr->mCloudDetail);
 
 	// Cloud extras
-	static std::string use_classic_clouds = "SkyUseClassicClouds";
-
 	childSetCommitCallback("WLCloudCoverage", onFloatControlMoved, &param_mgr->mCloudCoverage);
 	childSetCommitCallback("WLCloudScale", onFloatControlMoved, &param_mgr->mCloudScale);
 	childSetCommitCallback("WLCloudLockX", onCloudScrollXToggled, NULL);
@@ -189,8 +187,7 @@ void LLFloaterWindLight::initCallbacks(void)
 	childSetCommitCallback("WLCloudScrollX", onCloudScrollXMoved, NULL);
 	childSetCommitCallback("WLCloudScrollY", onCloudScrollYMoved, NULL);
 	childSetCommitCallback("WLDistanceMult", onFloatControlMoved, &param_mgr->mDistanceMult);
-	getChild<LLUICtrl>("DrawClassicClouds")->setCommitCallback(boost::bind(LLSavedSettingsGlue::setBOOL, _1, "SkyUseClassicClouds"));
-
+ 
 	// WL Top
 	childSetAction("WLDayCycleMenuButton", onOpenDayCycle, NULL);
 	// Load/save
@@ -373,7 +370,6 @@ void LLFloaterWindLight::syncMenu()
 	bool lockY = !param_mgr->mCurParams.getEnableCloudScrollY();
 	childSetValue("WLCloudLockX", lockX);
 	childSetValue("WLCloudLockY", lockY);
-	childSetValue("DrawClassicClouds", gSavedSettings.getBOOL("SkyUseClassicClouds"));
 	
 	// disable if locked, enable if not
 	if(lockX) 
diff --git a/indra/newview/llviewerregion.cpp b/indra/newview/llviewerregion.cpp
index 9b3ec80c03..214db03994 100644
--- a/indra/newview/llviewerregion.cpp
+++ b/indra/newview/llviewerregion.cpp
@@ -349,7 +349,6 @@ LLViewerRegion::~LLViewerRegion()
 	// Can't do this on destruction, because the neighbor pointers might be invalid.
 	// This should be reference counted...
 	disconnectAllNeighbors();
-	mCloudLayer.destroy();
 	LLViewerPartSim::getInstance()->cleanupRegion(this);
 
 	gObjectList.killObjects(this);
@@ -485,7 +484,6 @@ void LLViewerRegion::setOriginGlobal(const LLVector3d &origin_global)
 	updateRenderMatrix();
 	mImpl->mLandp->setOriginGlobal(origin_global);
 	mWind.setOriginGlobal(origin_global);
-	mCloudLayer.setOriginGlobal(origin_global);
 	calculateCenterGlobal();
 }
 
@@ -708,14 +706,12 @@ void LLViewerRegion::forceUpdate()
 void LLViewerRegion::connectNeighbor(LLViewerRegion *neighborp, U32 direction)
 {
 	mImpl->mLandp->connectNeighbor(neighborp->mImpl->mLandp, direction);
-	mCloudLayer.connectNeighbor(&(neighborp->mCloudLayer), direction);
 }
 
 
 void LLViewerRegion::disconnectAllNeighbors()
 {
 	mImpl->mLandp->disconnectAllNeighbors();
-	mCloudLayer.disconnectAllNeighbors();
 }
 
 LLVLComposition * LLViewerRegion::getComposition() const
diff --git a/indra/newview/llviewerregion.h b/indra/newview/llviewerregion.h
index eae04b2f0c..4bc487e4cb 100644
--- a/indra/newview/llviewerregion.h
+++ b/indra/newview/llviewerregion.h
@@ -34,7 +34,6 @@
 
 #include "lldarray.h"
 #include "llwind.h"
-#include "llcloud.h"
 #include "llstat.h"
 #include "v3dmath.h"
 #include "llstring.h"
@@ -334,7 +333,6 @@ protected:
 
 public:
 	LLWind  mWind;
-	LLCloudLayer mCloudLayer;
 	LLViewerParcelOverlay	*mParcelOverlay;
 
 	LLStat	mBitStat;
diff --git a/indra/newview/llvlmanager.cpp b/indra/newview/llvlmanager.cpp
index 25f2687fe2..d8de979f56 100644
--- a/indra/newview/llvlmanager.cpp
+++ b/indra/newview/llvlmanager.cpp
@@ -94,7 +94,7 @@ void LLVLManager::unpackData(const S32 num_packets)
 		}
 		else if (CLOUD_LAYER_CODE == datap->mType)
 		{
-			datap->mRegionp->mCloudLayer.decompress(bit_pack, &goph);
+
 		}
 	}
 
diff --git a/indra/newview/llworld.cpp b/indra/newview/llworld.cpp
index ec24b02934..596ab5931c 100644
--- a/indra/newview/llworld.cpp
+++ b/indra/newview/llworld.cpp
@@ -61,6 +61,8 @@
 #include <map>
 #include <cstring>
 
+#define TMP_WL_REMOVE_CLOUDS /* disables code for classic clouds */
+
 //
 // Globals
 //
@@ -91,8 +93,11 @@ LLWorld::LLWorld() :
 	mLastPacketsIn(0),
 	mLastPacketsOut(0),
 	mLastPacketsLost(0),
-	mSpaceTimeUSec(0),
-	mClassicCloudsEnabled(TRUE)
+	mSpaceTimeUSec(0)
+#ifndef TMP_WL_REMOVE_CLOUDS
+	,
+	mClassicCloudsEnabled(FALSE)
+#endif
 {
 	for (S32 i = 0; i < 8; i++)
 	{
@@ -183,10 +188,12 @@ LLViewerRegion* LLWorld::addRegion(const U64 &region_handle, const LLHost &host)
 		llerrs << "Unable to create new region!" << llendl;
 	}
 
+#ifndef TMP_WL_REMOVE_CLOUDS
 	regionp->mCloudLayer.create(regionp);
 	regionp->mCloudLayer.setWidth((F32)mWidth);
 	regionp->mCloudLayer.setWindPointer(&regionp->mWind);
-
+#endif // TMP_WL_REMOVE_CLOUDS
+	
 	mRegionList.push_back(regionp);
 	mActiveRegionList.push_back(regionp);
 	mCulledRegionList.push_back(regionp);
@@ -661,6 +668,7 @@ void LLWorld::updateParticles()
 	LLViewerPartSim::getInstance()->updateSimulation();
 }
 
+#ifndef TMP_WL_REMOVE_CLOUDS
 void LLWorld::updateClouds(const F32 dt)
 {
 	static LLFastTimer::DeclareTimer ftm("World Clouds");
@@ -672,33 +680,6 @@ void LLWorld::updateClouds(const F32 dt)
 		return;
 	}
 
-	if (
-		mClassicCloudsEnabled !=
-		gSavedSettings.getBOOL("SkyUseClassicClouds") )
-	{
-		// The classic cloud toggle has been flipped
-		// gotta update all of the cloud layers
-		mClassicCloudsEnabled =
-			gSavedSettings.getBOOL("SkyUseClassicClouds");
-
-		if ( !mClassicCloudsEnabled && mActiveRegionList.size() )
-		{
-			// We've transitioned to having classic clouds disabled
-			// reset all cloud layers.
-			for (
-				region_list_t::iterator iter = mActiveRegionList.begin();
-				iter != mActiveRegionList.end();
-				++iter)
-			{
-				LLViewerRegion* regionp = *iter;
-				regionp->mCloudLayer.reset();
-			}
-
-			return;
-		}
-	}
-	else if ( !mClassicCloudsEnabled ) return;
-
 	if (mActiveRegionList.size())
 	{
 		for (region_list_t::iterator iter = mActiveRegionList.begin();
@@ -745,7 +726,7 @@ LLCloudGroup* LLWorld::findCloudGroup(const LLCloudPuff &puff)
 	}
 	return NULL;
 }
-
+#endif // TMP_WL_REMOVE_CLOUDS
 
 void LLWorld::renderPropertyLines()
 {
diff --git a/indra/newview/skins/default/xui/en/floater_edit_sky_preset.xml b/indra/newview/skins/default/xui/en/floater_edit_sky_preset.xml
index 9d180a1f50..7ddb7ac1e1 100644
--- a/indra/newview/skins/default/xui/en/floater_edit_sky_preset.xml
+++ b/indra/newview/skins/default/xui/en/floater_edit_sky_preset.xml
@@ -987,16 +987,6 @@
              name="WLCloudScrollY"
              top_pad="6"
              width="200" />
-            <check_box
-             control_name="DrawClassicClouds"
-             follows="left|top"
-             height="16"
-             label="Draw Classic Clouds"
-             layout="topleft"
-             left_delta="-15"
-             name="DrawClassicClouds"
-             top_pad="20"
-             width="200" />
         </panel>
     </tab_container>
 <!--======== End of Controls panel ========-->
diff --git a/indra/newview/skins/default/xui/en/floater_windlight_options.xml b/indra/newview/skins/default/xui/en/floater_windlight_options.xml
index 249ad95c41..b121f3daa5 100644
--- a/indra/newview/skins/default/xui/en/floater_windlight_options.xml
+++ b/indra/newview/skins/default/xui/en/floater_windlight_options.xml
@@ -1273,16 +1273,6 @@
              name="WLCloudScrollY"
              top="85"
              width="200" />
-            <check_box
-             control_name="DrawClassicClouds"
-             follows="left"
-             height="16"
-             label="Draw Classic Clouds"
-             layout="topleft"
-             left="480"
-             name="DrawClassicClouds"
-             top="104"
-             width="200" />
         </panel>
     </tab_container>
 </floater>