summaryrefslogtreecommitdiff
path: root/indra/newview/llinspectobject.cpp
diff options
context:
space:
mode:
authorangela <angela@lindenlab.com>2009-10-29 00:12:17 +0800
committerangela <angela@lindenlab.com>2009-10-29 00:12:17 +0800
commit4f4be142b30cd77e23b28d16998323e539933b15 (patch)
treedd3451389fdd82db9247e79f3bec1ccd013f9e0d /indra/newview/llinspectobject.cpp
parentea5a60c80f0243a7e5a6a7fd8357e7c3cd6b5d4d (diff)
DEV-41714 Display a play/pause control for the inspected face if it contains time-based media
Diffstat (limited to 'indra/newview/llinspectobject.cpp')
-rw-r--r--indra/newview/llinspectobject.cpp8
1 files changed, 7 insertions, 1 deletions
diff --git a/indra/newview/llinspectobject.cpp b/indra/newview/llinspectobject.cpp
index 29cca14a7b..81544904e3 100644
--- a/indra/newview/llinspectobject.cpp
+++ b/indra/newview/llinspectobject.cpp
@@ -106,12 +106,14 @@ private:
private:
LLUUID mObjectID;
+ S32 mObjectFace;
LLSafeHandle<LLObjectSelection> mObjectSelection;
};
LLInspectObject::LLInspectObject(const LLSD& sd)
: LLInspect( LLSD() ), // single_instance, doesn't really need key
mObjectID(), // set in onOpen()
+ mObjectFace(0),
mObjectSelection()
{
// can't make the properties request until the widgets are constructed
@@ -182,7 +184,11 @@ void LLInspectObject::onOpen(const LLSD& data)
// Extract appropriate avatar id
mObjectID = data["object_id"];
-
+
+ if(data.has("object_face"))
+ {
+ mObjectFace = data["object_face"];
+ }
// Position the inspector relative to the mouse cursor
// Similar to how tooltips are positioned
// See LLToolTipMgr::createToolTip