Merge LL 3.7.2

Mon, 24 Feb 2014 12:37:32 -0800

author
Tank_Master
date
Mon, 24 Feb 2014 12:37:32 -0800
changeset 40762
0cb378196ad6
parent 40761
38f2a9fd24ee
parent 40749
7f25eb72444a
child 40763
1a7ed603a70c

Merge LL 3.7.2

.hgtags file | annotate | diff | revisions
indra/newview/VIEWER_VERSION.txt file | annotate | diff | revisions
indra/newview/llmeshrepository.cpp file | annotate | diff | revisions
     1.1 --- a/.hgtags	Fri Feb 21 16:45:23 2014 -0800
     1.2 +++ b/.hgtags	Mon Feb 24 12:37:32 2014 -0800
     1.3 @@ -511,3 +511,4 @@
     1.4  0d9b9e50f1a8880e05f15688a9ec7d09e0e81013 3.6.13-release
     1.5  5d746de933a98ca17887cde2fece80e9c7ab0b98 3.7.0-release
     1.6  dcb4981ce255841b6083d8f65444b65d5a733a17 3.7.1-release
     1.7 +b842534cb4d76c9ef87676a62b1d2d19e79c015f 3.7.2-release
     2.1 --- a/indra/newview/llmeshrepository.cpp	Fri Feb 21 16:45:23 2014 -0800
     2.2 +++ b/indra/newview/llmeshrepository.cpp	Mon Feb 24 12:37:32 2014 -0800
     2.3 @@ -4281,6 +4281,7 @@
     2.4  	}
     2.5  }
     2.6  
     2.7 +
     2.8  void LLPhysicsDecomp::run()
     2.9  {
    2.10  	LLConvexDecomposition* decomp = LLConvexDecomposition::getInstance();

mercurial