summaryrefslogtreecommitdiff
path: root/indra/newview/llviewermedia.h
diff options
context:
space:
mode:
authorEric M. Tulla (BigPapi) <tulla@lindenlab.com>2009-12-03 12:09:16 -0500
committerEric M. Tulla (BigPapi) <tulla@lindenlab.com>2009-12-03 12:09:16 -0500
commitb05ebd89775792762063d3af08f0fe9ae785454a (patch)
treeee364573584ba2dbd2d2699707f985fbad0cbf42 /indra/newview/llviewermedia.h
parent0cfc3af9aceede80230c7f2b36fb7fdcf0fcc179 (diff)
parent67f11add9c2e05e1c86e30c44c94ee1b7d9205d0 (diff)
merge of viewer2 into avp branch
--HG-- branch : avatar-pipeline
Diffstat (limited to 'indra/newview/llviewermedia.h')
-rw-r--r--indra/newview/llviewermedia.h1
1 files changed, 1 insertions, 0 deletions
diff --git a/indra/newview/llviewermedia.h b/indra/newview/llviewermedia.h
index ac12112ed4..e2d159304f 100644
--- a/indra/newview/llviewermedia.h
+++ b/indra/newview/llviewermedia.h
@@ -185,6 +185,7 @@ public:
void setHomeURL(const std::string& home_url) { mHomeURL = home_url; };
std::string getMimeType() { return mMimeType; }
void scaleMouse(S32 *mouse_x, S32 *mouse_y);
+ void scaleTextureCoords(const LLVector2& texture_coords, S32 *x, S32 *y);
void update();
void updateImagesMediaStreams();