merge up to 3.8.0-release (and fix for unit tests with a proxy enabled)'

1 files changed, 4 insertions, 0 deletions

diff --git a/indra/newview/llappviewer.h b/indra/newview/llappviewer.h
index 6a246e32e5..311e548cfb 100755
--- a/indra/newview/llappviewer.h
+++ b/indra/newview/llappviewer.h
@@ -137,6 +137,9 @@ public:
     void loadNameCache();
     void saveNameCache();
 
+	void loadExperienceCache();
+	void saveExperienceCache();
+
 	void removeMarkerFiles();
 	
 	void removeDumpDir();
@@ -245,6 +248,7 @@ private:
     void idle(); 
     void idleShutdown();
 	// update avatar SLID and display name caches
+	void idleExperienceCache();
 	void idleNameCache();
     void idleNetwork();