diff options
author | angela <angela@lindenlab.com> | 2009-11-03 11:09:44 +0800 |
---|---|---|
committer | angela <angela@lindenlab.com> | 2009-11-03 11:09:44 +0800 |
commit | 0b1ed9af5f32c7869cdf05763e4d6d5730b66327 (patch) | |
tree | 986e2baeee191338dcb3c063af80992b47f1ddb9 /indra/newview/llviewermedia.cpp | |
parent | 399e922d33ae36d415431a512020771e058454cd (diff) | |
parent | 3c1c0d7544805df7d77b7f2af4ab1f83ebf0839c (diff) |
merge
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) |