diff options
author | Vadim Savchuk <vsavchuk@productengine.com> | 2009-11-03 15:32:54 +0200 |
---|---|---|
committer | Vadim Savchuk <vsavchuk@productengine.com> | 2009-11-03 15:32:54 +0200 |
commit | 4a3eeda1ea5b555d15758dd7abee9b11c980e5b3 (patch) | |
tree | 400016fada68cf72c5bd64bd1e972ecdf100f530 /indra/newview/llviewermedia.cpp | |
parent | 645e2588511ff55b773e22fe3c9ee2c4de37843c (diff) | |
parent | eff50b018c93f7ddf328c750ddbea11f0a50f9c1 (diff) |
Merge from default branch
--HG--
branch : product-engine
Diffstat (limited to 'indra/newview/llviewermedia.cpp')
-rw-r--r-- | indra/newview/llviewermedia.cpp | 11 |
1 files changed, 11 insertions, 0 deletions
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 @@ -1190,6 +1190,17 @@ BOOL LLViewerMediaImpl::handleMouseUp(S32 x, S32 y, MASK mask) } ////////////////////////////////////////////////////////////////////////////////////////// +std::string LLViewerMediaImpl::getName() const +{ + if (mMediaSource) + { + return mMediaSource->getMediaName(); + } + + return LLStringUtil::null; +}; + +////////////////////////////////////////////////////////////////////////////////////////// void LLViewerMediaImpl::navigateBack() { if (mMediaSource) |