diff options
| author | Jacek Antonelli | 2011-05-25 23:42:48 -0500 |
|---|---|---|
| committer | Jacek Antonelli | 2011-05-25 23:42:48 -0500 |
| commit | d57cb15edd7fc0b12945629aef518f0d340c2f5d (patch) | |
| tree | 867c4a793128976daf207a7d3624d25eaba76d72 /linden/indra/newview/llviewermedia.cpp | |
| parent | Merge remote-tracking branch 'mccabe/1.4.0-fbeta-prefs_reorg' into next (diff) | |
| parent | Removed viewerversion.xml, since it's not used anymore. (diff) | |
| download | meta-impy-d57cb15edd7fc0b12945629aef518f0d340c2f5d.zip meta-impy-d57cb15edd7fc0b12945629aef518f0d340c2f5d.tar.gz meta-impy-d57cb15edd7fc0b12945629aef518f0d340c2f5d.tar.bz2 meta-impy-d57cb15edd7fc0b12945629aef518f0d340c2f5d.tar.xz | |
Merge branch 'viewerinfo' into next
Diffstat (limited to 'linden/indra/newview/llviewermedia.cpp')
| -rw-r--r-- | linden/indra/newview/llviewermedia.cpp | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/linden/indra/newview/llviewermedia.cpp b/linden/indra/newview/llviewermedia.cpp index 84fd0ba..dbb6f62 100644 --- a/linden/indra/newview/llviewermedia.cpp +++ b/linden/indra/newview/llviewermedia.cpp | |||
| @@ -40,7 +40,7 @@ | |||
| 40 | #include "llviewerimage.h" | 40 | #include "llviewerimage.h" |
| 41 | #include "llviewerwindow.h" | 41 | #include "llviewerwindow.h" |
| 42 | #include "llviewerimagelist.h" | 42 | #include "llviewerimagelist.h" |
| 43 | //#include "viewerversion.h" | 43 | //#include "viewerinfo.h" |
| 44 | 44 | ||
| 45 | #include "llpluginclassmedia.h" | 45 | #include "llpluginclassmedia.h" |
| 46 | 46 | ||
| @@ -261,7 +261,7 @@ std::string LLViewerMedia::getCurrentUserAgent() | |||
| 261 | std::ostringstream codec; | 261 | std::ostringstream codec; |
| 262 | codec << "SecondLife/"; | 262 | codec << "SecondLife/"; |
| 263 | codec << "C64 Basic V2"; | 263 | codec << "C64 Basic V2"; |
| 264 | //codec << ViewerVersion::getImpMajorVersion() << "." << ViewerVersion::getImpMinorVersion() << "." << ViewerVersion::getImpPatchVersion() << " " << ViewerVersion::getImpTestVersion(); | 264 | //codec << " " << ViewerInfo::versionNumbers3(); |
| 265 | //codec << " (" << channel << "; " << skin_name << " skin)"; | 265 | //codec << " (" << channel << "; " << skin_name << " skin)"; |
| 266 | // llinfos << codec.str() << llendl; | 266 | // llinfos << codec.str() << llendl; |
| 267 | 267 | ||