summaryrefslogtreecommitdiff
path: root/indra/newview/llpanelmediasettingsgeneral.h
diff options
context:
space:
mode:
authorSteve Bennetts <steve@lindenlab.com>2009-10-20 10:52:53 -0700
committerSteve Bennetts <steve@lindenlab.com>2009-10-20 10:52:53 -0700
commitafcccc3b36d96ababe61ca04dc6c9e02f4b20d81 (patch)
treef351783fb94e36ba6229bf4a9531eb4e42a4272f /indra/newview/llpanelmediasettingsgeneral.h
parent91fe3e7c790317420619aff1aae9ae14d38fa606 (diff)
parentaa75245a1aee3b64aeed31744e58fe96afa1ce7e (diff)
merge
Diffstat (limited to 'indra/newview/llpanelmediasettingsgeneral.h')
-rw-r--r--indra/newview/llpanelmediasettingsgeneral.h3
1 files changed, 2 insertions, 1 deletions
diff --git a/indra/newview/llpanelmediasettingsgeneral.h b/indra/newview/llpanelmediasettingsgeneral.h
index 1b60909786..5eb42ffaf4 100644
--- a/indra/newview/llpanelmediasettingsgeneral.h
+++ b/indra/newview/llpanelmediasettingsgeneral.h
@@ -64,6 +64,8 @@ public:
bool navigateHomeSelectedFace();
void updateMediaPreview();
void updateCurrentURL();
+
+ const std::string getHomeUrl();
protected:
LLFloaterMediaSettings* mParent;
@@ -76,7 +78,6 @@ private:
LLComboBox* mControls;
LLCheckBoxCtrl* mAutoLoop;
LLCheckBoxCtrl* mFirstClick;
-// LLTextureCtrl* mMediaPreview;
LLCheckBoxCtrl* mAutoZoom;
LLCheckBoxCtrl* mAutoPlay;
LLCheckBoxCtrl* mAutoScale;