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

Cinder's randumb startup messages

Browse Source
This commit is contained in:
Liru Færs
2019-10-17 18:39:57 -04:00
parent 0c2ec8cb71
commit a37299b4ae
2 changed files with 19 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

24
indra/newview/llappviewer.cpp
View File

@@ -51,7 +51,6 @@
#include "llviewerstats.h"
#include "llmarketplacefunctions.h"
#include "llmarketplacenotifications.h"
#include "llmd5.h"
#include "llmeshrepository.h"
#include "llmodaldialog.h"
#include "llpumpio.h"
@@ -63,7 +62,6 @@
#include "llares.h"
#include "llcurl.h"
#include "llcalc.h"
#include "lltexturestats.h"
#include "llviewerwindow.h"
#include "llviewerdisplay.h"
#include "llviewermedia.h"
@@ -138,8 +136,6 @@
#include "llassetstorage.h"
#include "llpolymesh.h"
#include "llaudioengine.h"
#include "llstreamingaudio.h"
#include "llviewermenu.h"
#include "llselectmgr.h"
#include "lltrans.h"
#include "lltracker.h"
@@ -147,7 +143,6 @@
#include "llworldmapview.h"
#include "llpostprocess.h"
#include "llwlparammanager.h"
#include "llwaterparammanager.h"
#include "lldebugview.h"
#include "llconsole.h"
@@ -166,9 +161,7 @@
#include "llbutton.h"
#include "llcombobox.h"
#include "floaterlocalassetbrowse.h"
#include "llstatusbar.h"
#include "llsurface.h"
#include "llvosky.h"
#include "llvotree.h"
#include "llfolderview.h"
#include "lltoolbar.h"
@@ -216,6 +209,8 @@
// llviewernetwork.h
#include "llviewernetwork.h"
#include <random>
////// Windows-specific includes to the bottom - nasty defines in these pollute the preprocessor
//
@@ -468,6 +463,7 @@ static void settings_to_globals()
MENU_BAR_HEIGHT = gSavedSettings.getS32("MenuBarHeight");
MENU_BAR_WIDTH = gSavedSettings.getS32("MenuBarWidth");
extern S32 STATUS_BAR_HEIGHT;
STATUS_BAR_HEIGHT = gSavedSettings.getS32("StatusBarHeight");
LLCOMBOBOX_HEIGHT = BTN_HEIGHT - 2;
@@ -862,7 +858,7 @@ bool LLAppViewer::init()
#endif
LLMIMETypes::parseMIMETypes( mime_types_name );
// Copy settings to globals. *TODO: Remove or move to appropriage class initializers
// Copy settings to globals. *TODO: Remove or move to appropriate class initializers
settings_to_globals();
// Setup settings listeners
settings_setup_listeners();
@@ -1577,7 +1573,7 @@ bool LLAppViewer::cleanup()
*/
// </edit>
void cleanup_menus();
cleanup_menus();
// Wait for any pending VFS IO
@@ -3341,8 +3337,14 @@ bool LLAppViewer::initCache()
// </edit>
}
LLSplashScreen::update(LLTrans::getString("StartupInitializingTextureCache"));
{
std::random_device rnddev;
std::mt19937 rng(rnddev());
std::uniform_int_distribution<> dist(0, 4);
LLSplashScreen::update(LLTrans::getString(
llformat("StartupInitializingTextureCache%d", dist(rng))));
}
// Init the texture cache
// Allocate 80% of the cache size for textures
const U64Bytes MIN_CACHE_SIZE = U32Megabytes(64);

8
indra/newview/skins/default/xui/en-us/strings.xml
View File

@@ -38,8 +38,12 @@ Make sure you entered the correct Login URI. An example of a Login URI is: \"htt
<!-- starting up -->
<string name="StartupDetectingHardware">Detecting hardware...</string>
<string name="StartupLoading">Loading [APP_NAME]...</string>
<string name="StartupClearingCache">Clearing cache...</string>
<string name="StartupInitializingTextureCache">Initializing Texture Cache...</string>
<string name="StartupClearingCache">Nuking cache...</string>
<string name="StartupInitializingTextureCache0">Fluffing texture cache...</string>
<string name="StartupInitializingTextureCache1">Reticulating pixel dump...</string>
<string name="StartupInitializingTextureCache2">Preheating texture baker...</string>
<string name="StartupInitializingTextureCache3">Booping snoot, texturally...</string>
<string name="StartupInitializingTextureCache4">Waking lumbering giant...</string>
<string name="StartupInitializingVFS">Initializing VFS...</string>
<string name="StartupRequireDriverUpdate">Graphics Initialization Failed. Please Update Your Graphics Driver!</string>