livie
/
phoenix-firestorm
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

STORM-2049: Fixed: FB/Twitter/Flickr floaters weren't opened with the "Photo" tab by default.

meow-7.2.2
NiranV 2014-07-30 05:51:11 +02:00
parent 870c2fbe9d
commit 62e1ac887a
2 changed files with 6 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
indra/newview/llpanelsnapshotoptions.cpp
View File

@ -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();
}

9
indra/newview/skins/default/xui/en/panel_snapshot_options.xml
View File

@ -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"