diff options
author | Nat Goodspeed <nat@lindenlab.com> | 2012-11-13 19:04:25 -0500 |
---|---|---|
committer | Nat Goodspeed <nat@lindenlab.com> | 2012-11-13 19:04:25 -0500 |
commit | b6b12d0ded7573397cdcf9284cff4c6f8937f726 (patch) | |
tree | b1b2694a494701dfb808ddc310e54ac31b7feeca /indra/newview/llappviewer.h | |
parent | be210914f4e9081f021cc1ad3b671765aba79b61 (diff) | |
parent | d65df92ef4719e0d4c98c5eafda9c7d19ae220c4 (diff) |
Automated merge with http://hg.secondlife.com/viewer-development
Diffstat (limited to 'indra/newview/llappviewer.h')
-rw-r--r-- | indra/newview/llappviewer.h | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/indra/newview/llappviewer.h b/indra/newview/llappviewer.h index 0d9c420ff8..7a474f9122 100644 --- a/indra/newview/llappviewer.h +++ b/indra/newview/llappviewer.h @@ -198,6 +198,7 @@ private: void initMaxHeapSize(); bool initThreads(); // Initialize viewer threads, return false on failure. bool initConfiguration(); // Initialize settings from the command line/config file. + void initStrings(); // Initialize LLTrans machinery void initUpdater(); // Initialize the updater service. bool initCache(); // Initialize local client cache. void checkMemory() ; |