diff options
| author | Jacek Antonelli | 2009-03-29 15:52:56 -0500 |
|---|---|---|
| committer | Jacek Antonelli | 2009-03-29 15:52:56 -0500 |
| commit | ae9a2e5859500c19d403ae8c02d073586e4567de (patch) | |
| tree | 07231699bbf82a6de795ba41f9f509c1b35a752c /linden/indra/newview/llappviewer.h | |
| parent | Using OpenAL framework on Mac after all. Maybe. (diff) | |
| parent | Fixed some minor mistakes in set_gst_plugin_path(). (diff) | |
| download | meta-impy-ae9a2e5859500c19d403ae8c02d073586e4567de.zip meta-impy-ae9a2e5859500c19d403ae8c02d073586e4567de.tar.gz meta-impy-ae9a2e5859500c19d403ae8c02d073586e4567de.tar.bz2 meta-impy-ae9a2e5859500c19d403ae8c02d073586e4567de.tar.xz | |
Merge commit 'origin/gst-revamp' into mac-1.1.0
Diffstat (limited to '')
| -rw-r--r-- | linden/indra/newview/llappviewer.h | 2 |
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 | ||
| 139 | protected: | 139 | protected: |
| 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. |