diff options
| author | Oz Linden <oz@lindenlab.com> | 2014-03-04 11:55:42 -0500 |
|---|---|---|
| committer | Oz Linden <oz@lindenlab.com> | 2014-03-04 11:55:42 -0500 |
| commit | ef794e7ffcfbf672e7115fc91f45f0e8340fdad5 (patch) | |
| tree | 86c967eeb773ae46c191ae3dde1a02a89ca4b1b5 | |
| parent | dfbc6c65f665f5c550581b77aeb7c308181fd8d8 (diff) | |
| parent | 199e65a6c5584dfcdd24d6885dd9b19bf0af953a (diff) | |
merge changes for storm-2015
| -rwxr-xr-x | .hgtags | 1 | ||||
| -rwxr-xr-x | doc/contributions.txt | 1 | ||||
| -rw-r--r-- | indra/newview/VIEWER_VERSION.txt | 2 | ||||
| -rwxr-xr-x | indra/newview/llfloaterwebcontent.cpp | 5 | ||||
| -rwxr-xr-x | indra/newview/llviewermessage.cpp | 2 |
5 files changed, 8 insertions, 3 deletions
@@ -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 diff --git a/doc/contributions.txt b/doc/contributions.txt index 5043c9febb..47b9bcf32a 100755 --- a/doc/contributions.txt +++ b/doc/contributions.txt @@ -693,6 +693,7 @@ Jonathan Yap STORM-1987 STORM-1986 STORM-1981 + STORM-2015 Kadah Coba STORM-1060 STORM-1843 diff --git a/indra/newview/VIEWER_VERSION.txt b/indra/newview/VIEWER_VERSION.txt index a76ccff2a6..0b2eb36f50 100644 --- a/indra/newview/VIEWER_VERSION.txt +++ b/indra/newview/VIEWER_VERSION.txt @@ -1 +1 @@ -3.7.1 +3.7.2 diff --git a/indra/newview/llfloaterwebcontent.cpp b/indra/newview/llfloaterwebcontent.cpp index 76b73fcf29..68dbb5ae33 100755 --- a/indra/newview/llfloaterwebcontent.cpp +++ b/indra/newview/llfloaterwebcontent.cpp @@ -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 ) { diff --git a/indra/newview/llviewermessage.cpp b/indra/newview/llviewermessage.cpp index 267aa9532c..d1524b74cd 100755 --- a/indra/newview/llviewermessage.cpp +++ b/indra/newview/llviewermessage.cpp @@ -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); |