SL-16421: Unify LLAppViewer class declaration alignment.
Use hard tabs as most of the class declaration already uses those.master
Nat Goodspeed
parent
bc95529003
commit
cb85a4aaee
|
|
@ -67,13 +67,13 @@ public:
|
|||
LLAppViewer();
|
||||
virtual ~LLAppViewer();
|
||||
|
||||
/**
|
||||
* @brief Access to the LLAppViewer singleton.
|
||||
*
|
||||
* The LLAppViewer singleton is created in main()/WinMain().
|
||||
* So don't use it in pre-entry (static initialization) code.
|
||||
*/
|
||||
static LLAppViewer* instance() {return sInstance; }
|
||||
/**
|
||||
* @brief Access to the LLAppViewer singleton.
|
||||
*
|
||||
* The LLAppViewer singleton is created in main()/WinMain().
|
||||
* So don't use it in pre-entry (static initialization) code.
|
||||
*/
|
||||
static LLAppViewer* instance() {return sInstance; }
|
||||
|
||||
//
|
||||
// Main application logic
|
||||
|
|
@ -91,12 +91,12 @@ public:
|
|||
void earlyExit(const std::string& name,
|
||||
const LLSD& substitutions = LLSD()); // Display an error dialog and forcibly quit.
|
||||
void earlyExitNoNotify(); // Do not display error dialog then forcibly quit.
|
||||
void abortQuit(); // Called to abort a quit request.
|
||||
void abortQuit(); // Called to abort a quit request.
|
||||
|
||||
bool quitRequested() { return mQuitRequested; }
|
||||
bool logoutRequestSent() { return mLogoutRequestSent; }
|
||||
bool quitRequested() { return mQuitRequested; }
|
||||
bool logoutRequestSent() { return mLogoutRequestSent; }
|
||||
bool isSecondInstance() { return mSecondInstance; }
|
||||
bool isUpdaterMissing() { return mUpdaterNotFound; }
|
||||
bool isUpdaterMissing() { return mUpdaterNotFound; }
|
||||
|
||||
void writeDebugInfo(bool isStatic=true);
|
||||
|
||||
|
|
@ -110,7 +110,7 @@ public:
|
|||
virtual bool restoreErrorTrap() = 0; // Require platform specific override to reset error handling mechanism.
|
||||
// return false if the error trap needed restoration.
|
||||
static void handleViewerCrash(); // Hey! The viewer crashed. Do this, soon.
|
||||
void checkForCrash();
|
||||
void checkForCrash();
|
||||
|
||||
// Thread accessors
|
||||
static LLTextureCache* getTextureCache() { return sTextureCache; }
|
||||
|
|
@ -121,37 +121,37 @@ public:
|
|||
static U32 getObjectCacheVersion() ;
|
||||
|
||||
const std::string& getSerialNumber() { return mSerialNumber; }
|
||||
|
||||
|
||||
bool getPurgeCache() const { return mPurgeCache; }
|
||||
|
||||
|
||||
std::string getSecondLifeTitle() const; // The Second Life title.
|
||||
std::string getWindowTitle() const; // The window display name.
|
||||
|
||||
void forceDisconnect(const std::string& msg); // Force disconnection, with a message to the user.
|
||||
void badNetworkHandler(); // Cause a crash state due to bad network packet.
|
||||
void forceDisconnect(const std::string& msg); // Force disconnection, with a message to the user.
|
||||
void badNetworkHandler(); // Cause a crash state due to bad network packet.
|
||||
|
||||
bool hasSavedFinalSnapshot() { return mSavedFinalSnapshot; }
|
||||
void saveFinalSnapshot();
|
||||
|
||||
void loadNameCache();
|
||||
void saveNameCache();
|
||||
void loadNameCache();
|
||||
void saveNameCache();
|
||||
|
||||
void loadExperienceCache();
|
||||
void saveExperienceCache();
|
||||
|
||||
void removeMarkerFiles();
|
||||
|
||||
|
||||
void removeDumpDir();
|
||||
// LLAppViewer testing helpers.
|
||||
// *NOTE: These will potentially crash the viewer. Only for debugging.
|
||||
virtual void forceErrorLLError();
|
||||
virtual void forceErrorBreakpoint();
|
||||
virtual void forceErrorBadMemoryAccess();
|
||||
virtual void forceErrorInfiniteLoop();
|
||||
virtual void forceErrorSoftwareException();
|
||||
virtual void forceErrorDriverCrash();
|
||||
virtual void forceErrorCoroutineCrash();
|
||||
virtual void forceErrorThreadCrash();
|
||||
// LLAppViewer testing helpers.
|
||||
// *NOTE: These will potentially crash the viewer. Only for debugging.
|
||||
virtual void forceErrorLLError();
|
||||
virtual void forceErrorBreakpoint();
|
||||
virtual void forceErrorBadMemoryAccess();
|
||||
virtual void forceErrorInfiniteLoop();
|
||||
virtual void forceErrorSoftwareException();
|
||||
virtual void forceErrorDriverCrash();
|
||||
virtual void forceErrorCoroutineCrash();
|
||||
virtual void forceErrorThreadCrash();
|
||||
|
||||
// The list is found in app_settings/settings_files.xml
|
||||
// but since they are used explicitly in code,
|
||||
|
|
@ -184,7 +184,7 @@ public:
|
|||
// *NOTE:Mani Fix this for login abstraction!!
|
||||
void handleLoginComplete();
|
||||
|
||||
LLAllocator & getAllocator() { return mAlloc; }
|
||||
LLAllocator & getAllocator() { return mAlloc; }
|
||||
|
||||
// On LoginCompleted callback
|
||||
typedef boost::signals2::signal<void (void)> login_completed_signal_t;
|
||||
|
|
@ -199,7 +199,7 @@ public:
|
|||
S32 updateTextureThreads(F32 max_time);
|
||||
|
||||
void loadKeyBindings();
|
||||
|
||||
|
||||
// mute/unmute the system's master audio
|
||||
virtual void setMasterSystemAudioMute(bool mute);
|
||||
virtual bool getMasterSystemAudioMute();
|
||||
|
|
@ -211,7 +211,7 @@ public:
|
|||
// llcorehttp init/shutdown/config information.
|
||||
LLAppCoreHttp & getAppCoreHttp() { return mAppCoreHttp; }
|
||||
|
||||
void updateNameLookupUrl(const LLViewerRegion* regionp);
|
||||
void updateNameLookupUrl(const LLViewerRegion* regionp);
|
||||
|
||||
protected:
|
||||
virtual bool initWindow(); // Initialize the viewer's window.
|
||||
|
|
@ -222,7 +222,7 @@ protected:
|
|||
virtual bool sendURLToOtherInstance(const std::string& url);
|
||||
|
||||
virtual bool initParseCommandLine(LLCommandLineParser& clp)
|
||||
{ return true; } // Allow platforms to specify the command line args.
|
||||
{ return true; } // Allow platforms to specify the command line args.
|
||||
|
||||
virtual std::string generateSerialNumber() = 0; // Platforms specific classes generate this.
|
||||
|
||||
|
|
@ -250,22 +250,22 @@ private:
|
|||
void processMarkerFiles();
|
||||
static void recordMarkerVersion(LLAPRFile& marker_file);
|
||||
bool markerIsSameVersion(const std::string& marker_name) const;
|
||||
|
||||
void idle();
|
||||
void idleShutdown();
|
||||
|
||||
void idle();
|
||||
void idleShutdown();
|
||||
// update avatar SLID and display name caches
|
||||
void idleExperienceCache();
|
||||
void idleNameCache();
|
||||
void idleNetwork();
|
||||
void idleNetwork();
|
||||
|
||||
void sendLogoutRequest();
|
||||
void disconnectViewer();
|
||||
void sendLogoutRequest();
|
||||
void disconnectViewer();
|
||||
|
||||
// *FIX: the app viewer class should be some sort of singleton, no?
|
||||
// Perhaps its child class is the singleton and this should be an abstract base.
|
||||
static LLAppViewer* sInstance;
|
||||
|
||||
bool mSecondInstance; // Is this a second instance of the app?
|
||||
bool mSecondInstance; // Is this a second instance of the app?
|
||||
bool mUpdaterNotFound; // True when attempt to start updater failed
|
||||
|
||||
std::string mMarkerFileName;
|
||||
|
|
@ -296,8 +296,8 @@ private:
|
|||
|
||||
boost::optional<U32> mForceGraphicsLevel;
|
||||
|
||||
bool mQuitRequested; // User wants to quit, may have modified documents open.
|
||||
bool mLogoutRequestSent; // Disconnect message sent to simulator, no longer safe to send messages to the sim.
|
||||
bool mQuitRequested; // User wants to quit, may have modified documents open.
|
||||
bool mLogoutRequestSent; // Disconnect message sent to simulator, no longer safe to send messages to the sim.
|
||||
U32 mLastAgentControlFlags;
|
||||
F32 mLastAgentForceUpdate;
|
||||
struct SettingsFiles* mSettingsLocationList;
|
||||
|
|
@ -311,12 +311,12 @@ private:
|
|||
bool mAgentRegionLastAlive;
|
||||
LLUUID mAgentRegionLastID;
|
||||
|
||||
LLAllocator mAlloc;
|
||||
LLAllocator mAlloc;
|
||||
|
||||
// llcorehttp library init/shutdown helper
|
||||
LLAppCoreHttp mAppCoreHttp;
|
||||
|
||||
bool mIsFirstRun;
|
||||
bool mIsFirstRun;
|
||||
};
|
||||
|
||||
// consts from viewer.h
|
||||
|
|
|
|||
Loading…
Reference in New Issue