Revert "Added option to disable LLWind"

This reverts commit 0677acc8e3.

indra/newview/app_settings/settings.xml

@@ -12692,16 +12692,5 @@
       <key>Value</key>
       <integer>0</integer>
     </map>
-    <key>UseLLWind</key>
-    <map>
-      <key>Comment</key>
-      <string>Disables LLWind's methods and returns nothing if enabled (saves FPS)</string>
-      <key>Persist</key>
-      <integer>1</integer>
-      <key>Type</key>
-      <string>Boolean</string>
-      <key>Value</key>
-      <integer>0</integer>
-    </map>
 </map>
 </llsd>

indra/newview/character/avatar_lad.xml

@@ -394,17 +394,6 @@
        max_attachment_offset="2.0"
        visible_in_first_person="true" />
        
-    <attachment_point
-       id="128"
-       group="8"
-       name="Jay Griff"
-       joint="mScreen"
-       position="0 0 0"
-       rotation="0 0 0"
-       hud="true"
-       max_attachment_offset="0.0"
-       visible_in_first_person="true" />
-       
     <param
        id="32"
        group="1"

indra/newview/llstartup.cpp

@@ -191,7 +191,6 @@
 #include "llagentlanguage.h"
 #include "llsocks5.h"
 #include "jcfloaterareasearch.h"
-#include "llwind.h"
 
 #if LL_WINDOWS
 #include "llwindebug.h"
@@ -2435,7 +2434,6 @@ bool idle_startup()
 	//---------------------------------------------------------------------
 	if (STATE_WORLD_INIT == LLStartUp::getStartupState())
 	{
-		gUseLLWind = gSavedSettings.getBOOL("UseLLWind");
 		set_startup_status(0.40f, LLTrans::getString("LoginInitializingWorld"), gAgent.mMOTD);
 		display_startup();
 		// We should have an agent id by this point.

indra/newview/lltoolbar.cpp

@@ -132,9 +132,6 @@ BOOL LLToolBar::postBuild()
 	childSetAction("radar_list_btn", onClickRadarList, this);
 	childSetControlName("radar_list_btn", "RadarListBtnState");
 
-	childSetAction("fly_btn", onClickFly, this);
-	childSetControlName("fly_btn", "FlyBtnState");
-
 	childSetAction("sit_btn", onClickSit, this);
 	childSetControlName("sit_btn", "SitBtnState");
 

indra/newview/llvotree.cpp

@@ -347,7 +347,7 @@ BOOL LLVOTree::idleUpdate(LLAgent &agent, LLWorld &world, const F64 &time)
 		return TRUE;
 	}
 	
-	if (gSavedSettings.getBOOL("RenderAnimateTrees") && gUseLLWind)
+	if (gSavedSettings.getBOOL("RenderAnimateTrees"))
 	{
 		F32 mass_inv; 
 
@@ -390,7 +390,7 @@ BOOL LLVOTree::idleUpdate(LLAgent &agent, LLWorld &world, const F64 &time)
 		}
 	} 
 
-	if (!gSavedSettings.getBOOL("RenderAnimateTrees") || !gUseLLWind)
+	if (!gSavedSettings.getBOOL("RenderAnimateTrees"))
 	{
 		if (mReferenceBuffer.isNull())
 		{

indra/newview/llwind.cpp

@@ -54,7 +54,6 @@
 
 
 const F32 CLOUD_DIVERGENCE_COEF = 0.5f; 
-BOOL gUseLLWind;
 
 
 //////////////////////////////////////////////////////////////////////
@@ -105,7 +104,7 @@ void LLWind::init()
 
 void LLWind::decompress(LLBitPack &bitpack, LLGroupHeader *group_headerp)
 {
-	if (!mCloudDensityp || !gUseLLWind)
+	if (!mCloudDensityp)
 	{
 		return;
 	}
@@ -182,8 +181,6 @@ void LLWind::decompress(LLBitPack &bitpack, LLGroupHeader *group_headerp)
 
 LLVector3 LLWind::getAverage()
 {
-	if(gUseLLWind)
-	{
 	//  Returns in average_wind the average wind velocity 
 	LLVector3 average(0.0f, 0.0f, 0.0f);	
 	S32 i, grid_count;
@@ -196,18 +193,11 @@ LLVector3 LLWind::getAverage()
 
 	average *= 1.f/((F32)(grid_count)) * WIND_SCALE_HACK;
 	return average;
-	}
-	else
-	{
-		return LLVector3(0, 0, 0);
-	}
 }
 
 
 LLVector3 LLWind::getVelocityNoisy(const LLVector3 &pos_region, const F32 dim)
 {
-	if(gUseLLWind)
-	{
 	//  Resolve a value, using fractal summing to perturb the returned value 
 	LLVector3 r_val(0,0,0);
 	F32 norm = 1.0f;
@@ -233,18 +223,11 @@ LLVector3 LLWind::getVelocityNoisy(const LLVector3 &pos_region, const F32 dim)
 	}
 	
 	return r_val * (1.0f/norm) * WIND_SCALE_HACK;
-	}
-	else
-	{
-		return LLVector3(0, 0, 0);
-	}
 }
 
 
 LLVector3 LLWind::getVelocity(const LLVector3 &pos_region)
 {
-	if(gUseLLWind)
-	{
 	llassert(mSize == 16);
 	// Resolves value of wind at a location relative to SW corner of region
 	//  
@@ -302,18 +285,11 @@ LLVector3 LLWind::getVelocity(const LLVector3 &pos_region)
 
 	r_val.mV[VZ] = 0.f;
 	return r_val * WIND_SCALE_HACK;
-	}
-	else
-	{
-		return LLVector3(0, 0, 0);
-	}
 }
 
 
 LLVector3 LLWind::getCloudVelocity(const LLVector3 &pos_region)
 {
-	if(gUseLLWind)
-	{
 	llassert(mSize == 16);
 	// Resolves value of wind at a location relative to SW corner of region
 	//  
@@ -371,11 +347,6 @@ LLVector3 LLWind::getCloudVelocity(const LLVector3 &pos_region)
 
 	r_val.mV[VZ] = 0.f;
 	return r_val * WIND_SCALE_HACK;
-	}
-	else
-	{
-		return LLVector3(0, 0, 0);
-	}
 }
 
 

indra/newview/llwind.h

@@ -42,7 +42,6 @@ class LLVector3;
 class LLBitPack;
 class LLGroupHeader;
 
-extern BOOL gUseLLWind;
 
 class LLWind  
 {
@@ -59,7 +58,6 @@ public:
 	void setCloudDensityPointer(F32 *densityp);
 
 	void setOriginGlobal(const LLVector3d &origin_global);
-	
 private:
 	S32 mSize;
 	F32 * mVelX;

indra/newview/skins/default/xui/en-us/panel_toolbar.xml

@@ -26,13 +26,12 @@
 	       label_selected="Radar" left="0" name="radar_list_btn"
 	       tool_tip="View a list of nearby avatars."
 	       width="50" follows="left|right" user_resize="false"/>
-    <button bottom="0" font="SansSerif" height="24" label="Fly"
+    <button bottom="0" font="SansSerif" height="24" label="Snapshot" left="0"
-        image_overlay="icn_toolbar_fly.tga" image_overlay_alignment="left"
+             image_overlay="icn_toolbar_snapshot.tga" image_overlay_alignment="left"
                         image_selected="toolbar_btn_selected.tga"
              image_unselected="toolbar_btn_enabled.tga"
              image_disabled="toolbar_btn_disabled.tga" scale_image="true"
-	       label_selected="Stop Flying" left="0" name="fly_btn"
+	       name="snapshot_btn" tool_tip="Save a screen shot to disk or inventory."
-	       tool_tip="Start flying. Use E/C or PgUp/PgDn to fly up and down."
 	       width="50" follows="left|right" user_resize="false"/>
     <button bottom="0" font="SansSerif" height="24" label="Search" left="0"
              image_overlay="icn_toolbar_search.tga" image_overlay_alignment="left"

indra/newview/viewer_manifest.py

@@ -740,13 +740,11 @@ class LinuxManifest(ViewerManifest):
         try:
             # --numeric-owner hides the username of the builder for
             # security etc.
- #I don't really care about this right now, disable it for a bit
+            self.run_command("tar -C '%(dir)s' --numeric-owner -cjf "
- #           self.run_command("tar -C '%(dir)s' --numeric-owner -cjf "
+                             "'%(inst_path)s.tar.bz2' %(inst_name)s" % {
- #                            "'%(inst_path)s.tar.bz2' %(inst_name)s" % {
+                'dir': self.get_build_prefix(),
- #               'dir': self.get_build_prefix(),
+                'inst_name': installer_name,
- #               'inst_name': installer_name,
+                'inst_path':self.build_path_of(installer_name)})
- #               'inst_path':self.build_path_of(installer_name)})
-             print ''
         finally:
             self.run_command("mv '%(inst)s' '%(dst)s'" % {
                 'dst': self.get_dst_prefix(),