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

merge changes for storm-2015

master
Oz Linden 2014-03-04 11:55:42 -05:00
parent dfbc6c65f6 199e65a6c5
commit ef794e7ffc
5 changed files with 8 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
.hgtags
View File

@ -473,3 +473,4 @@ d40c66e410741de7e90b1ed6dac28dd8a2d7e1f6 3.6.8-release
88bbfd7a6971033f3aa103f3a3500ceb4c73521b 3.6.12-release
0d9b9e50f1a8880e05f15688a9ec7d09e0e81013 3.6.13-release
5d746de933a98ca17887cde2fece80e9c7ab0b98 3.7.0-release
dcb4981ce255841b6083d8f65444b65d5a733a17 3.7.1-release

1
doc/contributions.txt
View File

@ -693,6 +693,7 @@ Jonathan Yap
STORM-1987
STORM-1986
STORM-1981
STORM-2015
Kadah Coba
STORM-1060
STORM-1843

2
indra/newview/VIEWER_VERSION.txt
View File

@ -1 +1 @@
3.7.1
3.7.2

5
indra/newview/llfloaterwebcontent.cpp
View File

@ -372,7 +372,10 @@ void LLFloaterWebContent::handleMediaEvent(LLPluginClassMedia* self, EMediaEvent
}
else if(event == MEDIA_EVENT_GEOMETRY_CHANGE)
{
geometryChanged(self->getGeometryX(), self->getGeometryY(), self->getGeometryWidth(), self->getGeometryHeight());
if (mCurrentURL.find("facebook.com/dialog/oauth") == std::string::npos) // HACK to fix ACME-1317 - Cho
{
geometryChanged(self->getGeometryX(), self->getGeometryY(), self->getGeometryWidth(), self->getGeometryHeight());
}
}
else if(event == MEDIA_EVENT_STATUS_TEXT_CHANGED )
{

2
indra/newview/llviewermessage.cpp
View File

@ -5985,7 +5985,7 @@ bool attempt_standard_notification(LLMessageSystem* msgsystem)
}
}
send_sound_trigger(LLUUID(gSavedSettings.getString("UISndRestart")), 1.0f);
make_ui_sound("UISndRestart");
}
LLNotificationsUtil::add(notificationID, llsdBlock);