diff options
| author | Rick Pasetto <rick@lindenlab.com> | 2009-11-03 09:44:09 -0800 |
|---|---|---|
| committer | Rick Pasetto <rick@lindenlab.com> | 2009-11-03 09:44:09 -0800 |
| commit | a0bbe8d8eb98aaba1dc55c7cbcb70d58125781ce (patch) | |
| tree | 279f3421a88280d6003d6973dcb5556702e2c52f /indra/newview/llviewermedia.cpp | |
| parent | c59e2d21174415842b1418c5f389becb7c013706 (diff) | |
| parent | c9d121dd01625790cb963372c861f8e4072430d2 (diff) | |
merge from remote repo
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) |