diff options
| author | Tofu Linden <tofu.linden@lindenlab.com> | 2010-06-15 14:41:08 +0100 |
|---|---|---|
| committer | Tofu Linden <tofu.linden@lindenlab.com> | 2010-06-15 14:41:08 +0100 |
| commit | 3a651fe40633cb5c63853d354d2ba08b61dacdfd (patch) | |
| tree | 44006d2a8df9af7e81711d4ec174586fdf4905c7 | |
| parent | 10af9428114ce3d517411fdc5cc48365df088e7e (diff) | |
| parent | b95bd0dc27465c65f511c071d89b7f3dda5bcab0 (diff) | |
merge backout
| -rw-r--r-- | indra/newview/llfloatersnapshot.cpp | 2 | ||||
| -rw-r--r-- | indra/newview/skins/default/xui/en/floater_snapshot.xml | 1 |
2 files changed, 1 insertions, 2 deletions
diff --git a/indra/newview/llfloatersnapshot.cpp b/indra/newview/llfloatersnapshot.cpp index 5bea3325a8..b9008fa53b 100644 --- a/indra/newview/llfloatersnapshot.cpp +++ b/indra/newview/llfloatersnapshot.cpp @@ -2196,7 +2196,7 @@ bool LLFloaterSnapshot::updateButtons(ESnapshotMode mode) childSetVisible("save", mode == SNAPSHOT_MAIN); childSetVisible("set_profile_pic", mode == SNAPSHOT_MAIN); -// childSetVisible("share_to_web", mode == SNAPSHOT_SHARE); + childSetVisible("share_to_web", mode == SNAPSHOT_SHARE); childSetVisible("share_to_email", mode == SNAPSHOT_SHARE); childSetVisible("save_to_inventory", mode == SNAPSHOT_SAVE); diff --git a/indra/newview/skins/default/xui/en/floater_snapshot.xml b/indra/newview/skins/default/xui/en/floater_snapshot.xml index f3d297c303..7dcf2aab99 100644 --- a/indra/newview/skins/default/xui/en/floater_snapshot.xml +++ b/indra/newview/skins/default/xui/en/floater_snapshot.xml @@ -62,7 +62,6 @@ name="share_to_web" top_delta="0" left="10" - visible="false" width="130"/> <button label="Save to My Inventory" |