summaryrefslogtreecommitdiff
path: root/indra/newview/llappviewer.h
diff options
context:
space:
mode:
authorOz Linden <oz@lindenlab.com>2011-03-18 19:56:37 -0400
committerOz Linden <oz@lindenlab.com>2011-03-18 19:56:37 -0400
commit85ccab2d8178c508e585f987bb076951bf2e9ddb (patch)
tree5fbdf54372657c2c9353d274cd81f62b1e4fdf02 /indra/newview/llappviewer.h
parent9f2a04f217d54344360edc554456d9804e17eeb7 (diff)
parent6ef593580239df7b967cca59d4cfa9fcd8db6aec (diff)
Automated merge with file:///Users/oz/Work/viewer-vs2010
Diffstat (limited to 'indra/newview/llappviewer.h')
-rw-r--r--indra/newview/llappviewer.h2
1 files changed, 1 insertions, 1 deletions
diff --git a/indra/newview/llappviewer.h b/indra/newview/llappviewer.h
index a18e6cbb02..0226211735 100644
--- a/indra/newview/llappviewer.h
+++ b/indra/newview/llappviewer.h
@@ -253,7 +253,7 @@ private:
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.
S32 mYieldTime;
- LLSD mSettingsLocationList;
+ struct SettingsFiles* mSettingsLocationList;
LLWatchdogTimeout* mMainloopTimeout;