summaryrefslogtreecommitdiff
path: root/indra/newview/llviewermediafocus.cpp
diff options
context:
space:
mode:
authorMonroe Linden <monroe@lindenlab.com>2009-10-30 18:14:20 -0700
committerMonroe Linden <monroe@lindenlab.com>2009-10-30 18:14:20 -0700
commit2fadd99877eceb55077957b5bab6353611184c86 (patch)
tree61669d1871c2bb5e78b35e9a41ece836a6e69352 /indra/newview/llviewermediafocus.cpp
parent9e602de33ae85bc78d6aa3c6bf45e29af7727796 (diff)
Another experiment: made the selection in the nearby media floater track the media impl the media controls are currently referencing (either focus or hover).
Diffstat (limited to 'indra/newview/llviewermediafocus.cpp')
-rw-r--r--indra/newview/llviewermediafocus.cpp14
1 files changed, 14 insertions, 0 deletions
diff --git a/indra/newview/llviewermediafocus.cpp b/indra/newview/llviewermediafocus.cpp
index ffdac35e71..2f7040aaa3 100644
--- a/indra/newview/llviewermediafocus.cpp
+++ b/indra/newview/llviewermediafocus.cpp
@@ -503,3 +503,17 @@ void LLViewerMediaFocus::focusZoomOnMedia(LLUUID media_id)
}
}
}
+
+LLUUID LLViewerMediaFocus::getControlsMediaID()
+{
+ if(getFocusedMediaImpl())
+ {
+ return mFocusedImplID;
+ }
+ else if(getHoverMediaImpl())
+ {
+ return mHoverImplID;
+ }
+
+ return LLUUID::null;
+}