diff options
| author | Richard Linden <none@none> | 2011-02-22 19:30:50 -0800 |
|---|---|---|
| committer | Richard Linden <none@none> | 2011-02-22 19:30:50 -0800 |
| commit | 5aa43e4f3e30d81fb518783189b3258e67b4620a (patch) | |
| tree | 4901a303d41e99052e99a31c5874c2318d7697c8 /indra/newview/llappviewer.h | |
| parent | 3968bf45a6a39fb1a2e9dc340984b1bb01af9615 (diff) | |
SOCIAL-545 WIP Figure out how to configure skylight-specific settings while retaining relevant user settings (login account name, etc.)
converted settings_file.xml to use param block descriptions for easier modification
added session settings file and user session settings file for per-session config overrides
Diffstat (limited to 'indra/newview/llappviewer.h')
| -rw-r--r-- | indra/newview/llappviewer.h | 2 |
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; |