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

merge changes for STORM-2060/STORM-2076

master
Oz Linden 2014-08-21 08:34:39 -04:00
parent d3c63401d2 0a134e749d
commit ae60558141
4 changed files with 18 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
doc/contributions.txt
View File

@ -1013,10 +1013,11 @@ NiranV Dean
STORM-2060
STORM-2061
STORM-2063
STORM-2064
STORM-2065
STORM-2066
STORM-2068
STORM-2073
STORM-2076
BUG-372
BUG-1179
BUG-6835
@ -1024,6 +1025,7 @@ NiranV Dean
BUG-6839
BUG-6840
BUG-6958
BUG-7020
Nounouch Hapmouche
VWR-238
Ollie Kubrick

7
indra/newview/llfloaterfacebook.cpp
View File

@ -156,7 +156,8 @@ void LLFacebookStatusPanel::onSend()
{
LLEventPumps::instance().obtain("FacebookConnectState").stopListening("LLFacebookStatusPanel"); // just in case it is already listening
LLEventPumps::instance().obtain("FacebookConnectState").listen("LLFacebookStatusPanel", boost::bind(&LLFacebookStatusPanel::onFacebookConnectStateChange, this, _1));
pressedConnect = FALSE;
// Connect to Facebook if necessary and then post
if (LLFacebookConnect::instance().isConnected())
{
@ -186,7 +187,8 @@ bool LLFacebookStatusPanel::onFacebookConnectStateChange(const LLSD& data)
switch (data.get("enum").asInteger())
{
case LLFacebookConnect::FB_CONNECTED:
sendStatus();
if(!pressedConnect)
sendStatus();
break;
case LLFacebookConnect::FB_POSTED:
@ -293,6 +295,7 @@ void LLFacebookStatusPanel::onConnect()
{
LLFacebookConnect::instance().checkConnectionToFacebook(true);
pressedConnect = TRUE;
//Clear only the facebook browser cookies so that the facebook login screen appears
LLViewerMedia::getCookieStore()->removeCookiesByDomain(".facebook.com");
}

2
indra/newview/llfloaterfacebook.h
View File

@ -62,6 +62,8 @@ private:
void showDisconnectedLayout();
void showConnectedLayout();
bool pressedConnect;
LLTextBox * mAccountCaptionLabel;
LLTextBox * mAccountNameLabel;
LLUICtrl * mPanelButtons;

19
indra/newview/llfloatersnapshot.cpp
View File

@ -1,4 +1,4 @@
/**
/**
* @file llfloatersnapshot.cpp
* @brief Snapshot preview window, allowing saving, e-mailing, etc.
*
@ -813,16 +813,11 @@ void LLFloaterSnapshot::Impl::updateResolution(LLUICtrl* ctrl, void* data, BOOL
previewp->getSize(width, height);
bool width_changed;
if(original_width != width)
{
width_changed = TRUE;
}
else
{
width_changed = FALSE;
}
updateSpinners(view, previewp, width, height, width_changed); // may change width and height
// We use the height spinner here because we come here via the aspect ratio
// checkbox as well and we want height always changing to width by default.
// If we use the width spinner we would change width according to height by
// default, that is not what we want.
updateSpinners(view, previewp, width, height, !getHeightSpinner(view)->isDirty()); // may change width and height
if(getWidthSpinner(view)->getValue().asInteger() != width || getHeightSpinner(view)->getValue().asInteger() != height)
{
@ -952,6 +947,8 @@ void LLFloaterSnapshot::Impl::setImageSizeSpinnersValues(LLFloaterSnapshot *view
// static
void LLFloaterSnapshot::Impl::updateSpinners(LLFloaterSnapshot* view, LLSnapshotLivePreview* previewp, S32& width, S32& height, BOOL is_width_changed)
{
getWidthSpinner(view)->resetDirty();
getHeightSpinner(view)->resetDirty();
if (checkImageSize(previewp, width, height, is_width_changed, previewp->getMaxImageSize()))
{
setImageSizeSpinnersValues(view, width, height);