aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/linden/indra/newview/llappviewer.h
diff options
context:
space:
mode:
authorMcCabe Maxsted2009-03-30 02:55:33 -0700
committerMcCabe Maxsted2009-03-30 02:55:33 -0700
commit8ad8d0bac5e0305e2f71d05cc9d1c22e71b217af (patch)
tree377f08b13ac8d0f3ba267a5cff91ebd7ae23431d /linden/indra/newview/llappviewer.h
parentMerge branch 'gst-revamp' into next (diff)
parentAdded flag for multi-core compiling in VS2005 (diff)
downloadmeta-impy-8ad8d0bac5e0305e2f71d05cc9d1c22e71b217af.zip
meta-impy-8ad8d0bac5e0305e2f71d05cc9d1c22e71b217af.tar.gz
meta-impy-8ad8d0bac5e0305e2f71d05cc9d1c22e71b217af.tar.bz2
meta-impy-8ad8d0bac5e0305e2f71d05cc9d1c22e71b217af.tar.xz
Merge commit 'edadcfadf71ac23d301a1b6fb186883d' into next
Diffstat (limited to 'linden/indra/newview/llappviewer.h')
-rw-r--r--linden/indra/newview/llappviewer.h2
1 files changed, 0 insertions, 2 deletions
diff --git a/linden/indra/newview/llappviewer.h b/linden/indra/newview/llappviewer.h
index 2083a93..58dc835 100644
--- a/linden/indra/newview/llappviewer.h
+++ b/linden/indra/newview/llappviewer.h
@@ -138,8 +138,6 @@ public:
138 138
139protected: 139protected:
140 140
141 void gst_plugin_path(); // Sets GST_PLUGIN_PATH environment variable for GStreamer.
142
143 virtual bool initWindow(); // Initialize the viewer's window. 141 virtual bool initWindow(); // Initialize the viewer's window.
144 virtual bool initLogging(); // Initialize log files, logging system, return false on failure. 142 virtual bool initLogging(); // Initialize log files, logging system, return false on failure.
145 virtual void initConsole() {}; // Initialize OS level debugging console. 143 virtual void initConsole() {}; // Initialize OS level debugging console.