Merge. Refresh from viewer-release after 3.7.1 release. 3.7.2-release

Fri, 14 Feb 2014 18:49:33 -0500

author
Monty Brandenberg <monty@lindenlab.com>
date
Fri, 14 Feb 2014 18:49:33 -0500
changeset 40747
b842534cb4d7
parent 40746
f7a37d5509f9
parent 40574
e5e5e3867de1
child 40748
b190d7cde04e

Merge. Refresh from viewer-release after 3.7.1 release.

     1.1 --- a/.hgtags	Tue Feb 11 13:41:31 2014 -0500
     1.2 +++ b/.hgtags	Fri Feb 14 18:49:33 2014 -0500
     1.3 @@ -473,3 +473,4 @@
     1.4  88bbfd7a6971033f3aa103f3a3500ceb4c73521b 3.6.12-release
     1.5  0d9b9e50f1a8880e05f15688a9ec7d09e0e81013 3.6.13-release
     1.6  5d746de933a98ca17887cde2fece80e9c7ab0b98 3.7.0-release
     1.7 +dcb4981ce255841b6083d8f65444b65d5a733a17 3.7.1-release
     2.1 --- a/indra/newview/VIEWER_VERSION.txt	Tue Feb 11 13:41:31 2014 -0500
     2.2 +++ b/indra/newview/VIEWER_VERSION.txt	Fri Feb 14 18:49:33 2014 -0500
     2.3 @@ -1,1 +1,1 @@
     2.4 -3.7.1
     2.5 +3.7.2
     3.1 --- a/indra/newview/llfloaterwebcontent.cpp	Tue Feb 11 13:41:31 2014 -0500
     3.2 +++ b/indra/newview/llfloaterwebcontent.cpp	Fri Feb 14 18:49:33 2014 -0500
     3.3 @@ -372,7 +372,10 @@
     3.4  	}
     3.5  	else if(event == MEDIA_EVENT_GEOMETRY_CHANGE)
     3.6  	{
     3.7 -		geometryChanged(self->getGeometryX(), self->getGeometryY(), self->getGeometryWidth(), self->getGeometryHeight());
     3.8 +		if (mCurrentURL.find("facebook.com/dialog/oauth") == std::string::npos) // HACK to fix ACME-1317 - Cho
     3.9 +		{
    3.10 +			geometryChanged(self->getGeometryX(), self->getGeometryY(), self->getGeometryWidth(), self->getGeometryHeight());
    3.11 +		}
    3.12  	}
    3.13  	else if(event == MEDIA_EVENT_STATUS_TEXT_CHANGED )
    3.14  	{

mercurial