revert a bunch of stuff from my local repo so this can go in minimally.

6 files changed, 17 insertions, 15 deletions

diff --git a/indra/llmath/llvolume.cpp b/indra/llmath/llvolume.cpp
index dabec6390d..c4be176353 100644
--- a/indra/llmath/llvolume.cpp
+++ b/indra/llmath/llvolume.cpp
@@ -1898,7 +1898,7 @@ BOOL LLVolume::generate()
 	// Split is a parameter to LLProfile::generate that tesselates edges on the profile 

 	// to prevent lighting and texture interpolation errors on triangles that are 

 	// stretched due to twisting or scaling on the path.  

-	S32 split = 0;//(S32) ((mDetail)*0.66f);

+	S32 split = (S32) ((mDetail)*0.66f);

 	

 	if (mParams.getPathParams().getCurveType() == LL_PCODE_PATH_LINE &&

 		(mParams.getPathParams().getScale().mV[0] != 1.0f ||

diff --git a/indra/llprimitive/llmodel.cpp b/indra/llprimitive/llmodel.cpp
index 2284ca0bee..eed82f924b 100755
--- a/indra/llprimitive/llmodel.cpp
+++ b/indra/llprimitive/llmodel.cpp
@@ -66,7 +66,7 @@ LLModel::~LLModel()
 {
 	if (mDecompID >= 0)
 	{
-//		LLConvexDecomposition::getInstance()->deleteDecomposition(mDecompID);
+		LLConvexDecomposition::getInstance()->deleteDecomposition(mDecompID);
 	}
 }
 
diff --git a/indra/llui/CMakeLists.txt b/indra/llui/CMakeLists.txt
index 3e94a4738b..684e393cba 100644
--- a/indra/llui/CMakeLists.txt
+++ b/indra/llui/CMakeLists.txt
@@ -245,11 +245,11 @@ target_link_libraries(llui
     )
 
 # Add tests
-if (0 AND LL_TESTS)
+if (LL_TESTS)
 	include(LLAddBuildTest)
 	SET(llui_TEST_SOURCE_FILES
 		llurlmatch.cpp
 		llurlentry.cpp
 		)
 	LL_ADD_PROJECT_UNIT_TESTS(llui "${llui_TEST_SOURCE_FILES}")
-endif (0 AND LL_TESTS)
+endif (LL_TESTS)
\ No newline at end of file
diff --git a/indra/newview/llfloatersearch.cpp b/indra/newview/llfloatersearch.cpp
index 1e321674a7..2041fac8d8 100644
--- a/indra/newview/llfloatersearch.cpp
+++ b/indra/newview/llfloatersearch.cpp
@@ -103,14 +103,14 @@ BOOL LLFloaterSearch::postBuild()
 
 void LLFloaterSearch::onOpen(const LLSD& key)
 {
-	if ( (key.has("category")) || ((mBrowser) && (mBrowser->getCurrentNavUrl().empty())) )
-	{
-		// new search triggered - blank the page while loading, instead of
-		//  temporarily showing stale results
-		mBrowser->navigateTo("about:blank");
+	search(key);
+}
 
-		search(key);
-	}
+void LLFloaterSearch::onClose(bool app_quitting)
+{
+	// tear down the web view so we don't show the previous search
+	// result when the floater is opened next time
+	destroy();
 }
 
 void LLFloaterSearch::handleMediaEvent(LLPluginClassMedia *self, EMediaEvent event)
diff --git a/indra/newview/llfloatersearch.h b/indra/newview/llfloatersearch.h
index 615c099d0d..ba4dc4c0fa 100644
--- a/indra/newview/llfloatersearch.h
+++ b/indra/newview/llfloatersearch.h
@@ -53,6 +53,8 @@ public:
 	/// see search() for details on the key parameter.
 	/*virtual*/ void onOpen(const LLSD& key);
 
+	/*virtual*/ void onClose(bool app_quitting);
+
 	/// perform a search with the specific search term.
 	/// The key should be a map that can contain the following keys:
 	///  - "id": specifies the text phrase to search for
diff --git a/indra/newview/llmeshrepository.cpp b/indra/newview/llmeshrepository.cpp
index 986b8cd509..93e773d33b 100755
--- a/indra/newview/llmeshrepository.cpp
+++ b/indra/newview/llmeshrepository.cpp
@@ -3532,7 +3532,7 @@ void LLPhysicsDecomp::run()
 	
 	if (!stages)
 	{
-		//num_stages = decomp->getStages(&stages);
+		num_stages = decomp->getStages(&stages);
 	}
 
 	for (S32 i = 0; i < num_stages; i++)
@@ -3554,9 +3554,9 @@ void LLPhysicsDecomp::run()
 			S32& id = *(mCurRequest->mDecompID);
 			if (id == -1)
 			{
-				//decomp->genDecomposition(id);
+				decomp->genDecomposition(id);
 			}
-			//decomp->bindDecomposition(id);
+			decomp->bindDecomposition(id);
 
 			if (mCurRequest->mStage == "single_hull")
 			{
@@ -3569,7 +3569,7 @@ void LLPhysicsDecomp::run()
 		}
 	}
 
-	//decomp->quitThread();
+	decomp->quitThread();
 	
 	if (mSignal->isLocked())
 	{ //let go of mSignal's associated mutex