diff options
| author | Roxie Linden <roxie@lindenlab.com> | 2010-02-01 15:10:19 -0800 |
|---|---|---|
| committer | Roxie Linden <roxie@lindenlab.com> | 2010-02-01 15:10:19 -0800 |
| commit | fe71dd340ab396b93bde45df438041af5d85fd47 (patch) | |
| tree | b07b92b80e5a8f113252ea0b650684567557c851 /indra/newview/llappviewer.h | |
| parent | 1a9d19d95527d717b89d4ebf45af81824fcbdf44 (diff) | |
Merge giab-viewer-trunk 2497, general merge of more
secapi stuff as well as certificate handling stuff.
Grid manager as well
Diffstat (limited to 'indra/newview/llappviewer.h')
| -rw-r--r-- | indra/newview/llappviewer.h | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/indra/newview/llappviewer.h b/indra/newview/llappviewer.h index 40e74061b5..870d47aa79 100644 --- a/indra/newview/llappviewer.h +++ b/indra/newview/llappviewer.h @@ -186,7 +186,6 @@ private: bool initThreads(); // Initialize viewer threads, return false on failure. bool initConfiguration(); // Initialize settings from the command line/config file. - void initGridChoice(); bool initCache(); // Initialize local client cache. |