added code to disable llwind

This commit is contained in:
Hazim Gazov
2010-04-17 19:14:57 -03:00
parent 22b9bd1c2e
commit 615202da70
7 changed files with 56 additions and 16 deletions

View File

@@ -173,6 +173,7 @@
#include "llvoavatar.h"
#include "llvoclouds.h"
#include "llweb.h"
#include "llwind.h"
#include "llworld.h"
#include "llworldmapmessage.h"
#include "llxfermanager.h"
@@ -212,6 +213,7 @@ std::string SCREEN_LAST_FILENAME = "screen_last.bmp";
//
extern S32 gStartImageWidth;
extern S32 gStartImageHeight;
extern bool gLLWindEnabled;
//
// local globals
@@ -2434,6 +2436,9 @@ bool idle_startup()
//---------------------------------------------------------------------
if (STATE_WORLD_INIT == LLStartUp::getStartupState())
{
//first of all, let's check if wind should be used
gLLWindEnabled = gSavedSettings.getBOOL("WindEnabled");
set_startup_status(0.40f, LLTrans::getString("LoginInitializingWorld"), gAgent.mMOTD);
display_startup();
// We should have an agent id by this point.