diff options
| author | NiranV <NiranV.Dean@googlemail.com> | 2014-07-30 05:51:11 +0200 |
|---|---|---|
| committer | NiranV <NiranV.Dean@googlemail.com> | 2014-07-30 05:51:11 +0200 |
| commit | 62e1ac887acf513cf08e805599095d419309b098 (patch) | |
| tree | 4c8a7675eb07f942e75ae7517e11638067023d8e /indra | |
| parent | 870c2fbe9dbd78c01a4cf09fb7c672c325d53664 (diff) | |
STORM-2049: Fixed: FB/Twitter/Flickr floaters weren't opened with the "Photo" tab by default.
Diffstat (limited to 'indra')
| -rwxr-xr-x | indra/newview/llpanelsnapshotoptions.cpp | 11 | ||||
| -rwxr-xr-x | indra/newview/skins/default/xui/en/panel_snapshot_options.xml | 9 |
2 files changed, 6 insertions, 14 deletions
diff --git a/indra/newview/llpanelsnapshotoptions.cpp b/indra/newview/llpanelsnapshotoptions.cpp index 743ef3e329..487227daed 100755 --- a/indra/newview/llpanelsnapshotoptions.cpp +++ b/indra/newview/llpanelsnapshotoptions.cpp @@ -72,7 +72,9 @@ LLPanelSnapshotOptions::LLPanelSnapshotOptions() mCommitCallbackRegistrar.add("Snapshot.SaveToEmail", boost::bind(&LLPanelSnapshotOptions::onSaveToEmail, this)); mCommitCallbackRegistrar.add("Snapshot.SaveToInventory", boost::bind(&LLPanelSnapshotOptions::onSaveToInventory, this)); mCommitCallbackRegistrar.add("Snapshot.SaveToComputer", boost::bind(&LLPanelSnapshotOptions::onSaveToComputer, this)); - + mCommitCallbackRegistrar.add("Snapshot.SendToFacebook", boost::bind(&LLPanelSnapshotOptions::onSendToFacebook, this)); + mCommitCallbackRegistrar.add("Snapshot.SendToTwitter", boost::bind(&LLPanelSnapshotOptions::onSendToTwitter, this)); + mCommitCallbackRegistrar.add("Snapshot.SendToFlickr", boost::bind(&LLPanelSnapshotOptions::onSendToFlickr, this)); LLGlobalEconomy::Singleton::getInstance()->addObserver(this); } @@ -84,13 +86,6 @@ LLPanelSnapshotOptions::~LLPanelSnapshotOptions() // virtual BOOL LLPanelSnapshotOptions::postBuild() { - LLTextBox* sendToFacebookTextBox = getChild<LLTextBox>("send_to_facebook_textbox"); - sendToFacebookTextBox->setURLClickedCallback(boost::bind(&LLPanelSnapshotOptions::onSendToFacebook, this)); - LLTextBox* sendToTwitterTextBox = getChild<LLTextBox>("send_to_twitter_textbox"); - sendToTwitterTextBox->setURLClickedCallback(boost::bind(&LLPanelSnapshotOptions::onSendToTwitter, this)); - LLTextBox* sendToFlickrTextBox = getChild<LLTextBox>("send_to_flickr_textbox"); - sendToFlickrTextBox->setURLClickedCallback(boost::bind(&LLPanelSnapshotOptions::onSendToFlickr, this)); - return LLPanel::postBuild(); } diff --git a/indra/newview/skins/default/xui/en/panel_snapshot_options.xml b/indra/newview/skins/default/xui/en/panel_snapshot_options.xml index c27a4df264..2f8efd9b13 100755 --- a/indra/newview/skins/default/xui/en/panel_snapshot_options.xml +++ b/indra/newview/skins/default/xui/en/panel_snapshot_options.xml @@ -71,8 +71,7 @@ name="send_to_facebook_btn" top_pad="5"> <button.commit_callback - function="Floater.Toggle" - parameter="facebook"/> + function="Snapshot.SendToFacebook"/> </button> <button follows="left|top" @@ -89,8 +88,7 @@ name="send_to_twitter_btn" top_pad="5"> <button.commit_callback - function="Floater.Toggle" - parameter="twitter"/> + function="Snapshot.SendToTwitter"/> </button> <button follows="left|top" @@ -107,8 +105,7 @@ name="send_to_flickr_btn" top_pad="5"> <button.commit_callback - function="Floater.Toggle" - parameter="flickr"/> + function="Snapshot.SendToFlickr"/> </button> <button follows="left|top" |