Merge LL 3.7.2

2014-02-24 12:37:32 -08:00 · 2014-02-24 12:37:32 -08:00 · 2edeaa7d68
parent 4676c81120 de8fea1362
commit 2edeaa7d68
2 changed files with 2 additions and 0 deletions
--- a/.hgtags
+++ b/.hgtags
@ -511,3 +511,4 @@ d40c66e410741de7e90b1ed6dac28dd8a2d7e1f6 3.6.8-release
 0d9b9e50f1a8880e05f15688a9ec7d09e0e81013 3.6.13-release
 5d746de933a98ca17887cde2fece80e9c7ab0b98 3.7.0-release
 dcb4981ce255841b6083d8f65444b65d5a733a17 3.7.1-release
+b842534cb4d76c9ef87676a62b1d2d19e79c015f 3.7.2-release
--- a/indra/newview/llmeshrepository.cpp
+++ b/indra/newview/llmeshrepository.cpp
@ -4281,6 +4281,7 @@ void LLPhysicsDecomp::doDecompositionSingleHull()
 	}
 }

+
 void LLPhysicsDecomp::run()
 {
 	LLConvexDecomposition* decomp = LLConvexDecomposition::getInstance();