From 7d23b8432747c9c11834dac2b96019246073988a Mon Sep 17 00:00:00 2001 From: Monroe Linden Date: Mon, 2 Nov 2009 10:55:25 -0800 Subject: Hook up LLViewerMediaImpl::getName() to call through to LLPluginClassMedia::getMediaName() as it should. --- indra/newview/llviewermedia.cpp | 11 +++++++++++ indra/newview/llviewermedia.h | 2 +- 2 files changed, 12 insertions(+), 1 deletion(-) diff --git a/indra/newview/llviewermedia.cpp b/indra/newview/llviewermedia.cpp index e89f17cf72..55e4f28e75 100644 --- a/indra/newview/llviewermedia.cpp +++ b/indra/newview/llviewermedia.cpp @@ -1189,6 +1189,17 @@ BOOL LLViewerMediaImpl::handleMouseUp(S32 x, S32 y, MASK mask) return TRUE; } +////////////////////////////////////////////////////////////////////////////////////////// +std::string LLViewerMediaImpl::getName() const +{ + if (mMediaSource) + { + return mMediaSource->getMediaName(); + } + + return LLStringUtil::null; +}; + ////////////////////////////////////////////////////////////////////////////////////////// void LLViewerMediaImpl::navigateBack() { diff --git a/indra/newview/llviewermedia.h b/indra/newview/llviewermedia.h index dac0482078..517a76ce3d 100644 --- a/indra/newview/llviewermedia.h +++ b/indra/newview/llviewermedia.h @@ -228,7 +228,7 @@ public: /*virtual*/ BOOL handleToolTip(S32 x, S32 y, MASK mask) { return FALSE; }; /*virtual*/ BOOL handleMiddleMouseDown(S32 x, S32 y, MASK mask) { return FALSE; }; /*virtual*/ BOOL handleMiddleMouseUp(S32 x, S32 y, MASK mask) {return FALSE; }; - /*virtual*/ std::string getName() const { return LLStringUtil::null; }; + /*virtual*/ std::string getName() const; /*virtual*/ void screenPointToLocal(S32 screen_x, S32 screen_y, S32* local_x, S32* local_y) const {}; /*virtual*/ void localPointToScreen(S32 local_x, S32 local_y, S32* screen_x, S32* screen_y) const {}; -- cgit v1.2.3