summaryrefslogtreecommitdiff
path: root/indra/newview/llpanelmediasettingsgeneral.h
diff options
context:
space:
mode:
authorSteve Bennetts <steve@lindenlab.com>2009-10-19 10:49:48 -0700
committerSteve Bennetts <steve@lindenlab.com>2009-10-19 10:49:48 -0700
commit65bf35cfed4b67d5f27628144f7519c81bd97dac (patch)
tree8ca423d53d3105133e40e7bd7d3aaea3f0528023 /indra/newview/llpanelmediasettingsgeneral.h
parent6c1706da69193de3ddbaf69a40e5ba0cad13283e (diff)
parentfce70328535ec04aba64972f47cface0b2fd3046 (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;