Singularity-Viewer/SingularityViewer
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'origin/master'

Browse Source
This commit is contained in:
Aleric Inglewood
2011-06-14 16:02:43 +02:00
parent e42277a2c2 42f60042eb
commit a8d71f2550
51 changed files with 2410 additions and 1968 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
indra/newview/llstartup.cpp
View File

@@ -237,7 +237,6 @@ std::string SCREEN_LAST_FILENAME = "screen_last.bmp";
//
extern S32 gStartImageWidth;
extern S32 gStartImageHeight;
extern bool gLLWindEnabled;
//
// local globals
@@ -1895,9 +1894,6 @@ 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);
// Initialize the rest of the world.