diff options
author | McCabe Maxsted | 2009-02-18 07:07:31 -0700 |
---|---|---|
committer | McCabe Maxsted | 2009-02-18 07:07:31 -0700 |
commit | 1b7dec80a55365ebda061319a134cf87a1aaa61a (patch) | |
tree | 81291a0db8a8b8a7fe9a9fcb134fff66c8eebad1 /linden/indra/newview/llfloaterabout.cpp | |
parent | Added error checking to play/stop/pause to prevent bad looping (diff) | |
download | meta-impy-1b7dec80a55365ebda061319a134cf87a1aaa61a.zip meta-impy-1b7dec80a55365ebda061319a134cf87a1aaa61a.tar.gz meta-impy-1b7dec80a55365ebda061319a134cf87a1aaa61a.tar.bz2 meta-impy-1b7dec80a55365ebda061319a134cf87a1aaa61a.tar.xz |
Added GStreamer version info to About > Imprudence
Diffstat (limited to '')
-rw-r--r-- | linden/indra/newview/llfloaterabout.cpp | 10 |
1 files changed, 10 insertions, 0 deletions
diff --git a/linden/indra/newview/llfloaterabout.cpp b/linden/indra/newview/llfloaterabout.cpp index 4953410..aeca4b5 100644 --- a/linden/indra/newview/llfloaterabout.cpp +++ b/linden/indra/newview/llfloaterabout.cpp | |||
@@ -42,6 +42,7 @@ | |||
42 | #include "llcurl.h" | 42 | #include "llcurl.h" |
43 | #include "llimagej2c.h" | 43 | #include "llimagej2c.h" |
44 | #include "audioengine.h" | 44 | #include "audioengine.h" |
45 | #include "llmediaimplgstreamer.h" | ||
45 | 46 | ||
46 | #include "llviewertexteditor.h" | 47 | #include "llviewertexteditor.h" |
47 | #include "llviewercontrol.h" | 48 | #include "llviewercontrol.h" |
@@ -208,6 +209,15 @@ LLFloaterAbout::LLFloaterAbout() | |||
208 | LLMediaManager *mgr = LLMediaManager::getInstance(); | 209 | LLMediaManager *mgr = LLMediaManager::getInstance(); |
209 | if (mgr) | 210 | if (mgr) |
210 | { | 211 | { |
212 | LLMediaBase *gstreamer = new LLMediaImplGStreamer(); | ||
213 | if (gstreamer) | ||
214 | { | ||
215 | support.append("GStreamer Version: "); | ||
216 | support.append( gstreamer->getVersion() ); | ||
217 | support.append("\n"); | ||
218 | } | ||
219 | delete gstreamer; | ||
220 | |||
211 | LLMediaBase *media_source = mgr->createSourceFromMimeType("http", "text/html"); | 221 | LLMediaBase *media_source = mgr->createSourceFromMimeType("http", "text/html"); |
212 | if (media_source) | 222 | if (media_source) |
213 | { | 223 | { |