summaryrefslogtreecommitdiff
path: root/indra/newview/llviewermedia.h
diff options
context:
space:
mode:
authorLoren Shih <seraph@lindenlab.com>2009-12-03 15:41:36 -0500
committerLoren Shih <seraph@lindenlab.com>2009-12-03 15:41:36 -0500
commit1ffd7c99afe25da37a83a2a1dd8a03c7275a5f6b (patch)
treead40ea009c5ebea67dd5334d210d90b6dbeebbd3 /indra/newview/llviewermedia.h
parent202d86b15567a783bed55849a7cdc8ad8d8f874f (diff)
parenta9609ae1557a70e095088e0a9b6ef5564dfdb388 (diff)
automated merge for avp->avp
--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();