Merge branch 'master' into DRTVWR-539

1 files changed, 11 insertions, 10 deletions

diff --git a/indra/newview/llappviewer.h b/indra/newview/llappviewer.h
index 7ab21f35cd..f28a90c703 100644
--- a/indra/newview/llappviewer.h
+++ b/indra/newview/llappviewer.h
@@ -130,6 +130,7 @@ public:
 
 	static U32 getTextureCacheVersion() ;
 	static U32 getObjectCacheVersion() ;
+    static U32 getDiskCacheVersion() ;
 
 	const std::string& getSerialNumber() { return mSerialNumber; }
 
@@ -153,16 +154,16 @@ public:
 	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,