summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorOz Linden <oz@lindenlab.com>2016-07-27 09:53:20 -0400
committerOz Linden <oz@lindenlab.com>2016-07-27 09:53:20 -0400
commit781cf7fac47812d8f779113e61fa02daa97b67fe (patch)
treeb720f8fba2854cb57f4bb1dd55c9f5bc8a5e08b1
parent3f2b5f404942c9e5f98f75de819c788ea127c086 (diff)
remove use of "override" C++11 feature not supported on gcc 4.6
-rw-r--r--indra/media_plugins/libvlc/media_plugin_libvlc.cpp2
1 files changed, 1 insertions, 1 deletions
diff --git a/indra/media_plugins/libvlc/media_plugin_libvlc.cpp b/indra/media_plugins/libvlc/media_plugin_libvlc.cpp
index c1e34b5c8f..0bd323eb58 100644
--- a/indra/media_plugins/libvlc/media_plugin_libvlc.cpp
+++ b/indra/media_plugins/libvlc/media_plugin_libvlc.cpp
@@ -61,7 +61,7 @@ private:
static void unlock(void* data, void* id, void* const* raw_pixels);
static void display(void* data, void* id);
- /*virtual*/ void setDirty(int left, int top, int right, int bottom) override;
+ /*virtual*/ void setDirty(int left, int top, int right, int bottom) /* override, but that is not supported in gcc 4.6 */;
static void eventCallbacks(const libvlc_event_t* event, void* ptr);