From 19a3d43ce94aaa332292780322d2a368f797d90a Mon Sep 17 00:00:00 2001
From: Ansariel <none@none>
Date: Sat, 11 May 2019 14:38:15 +0200
Subject: [PATCH] Fix one more case of OpenSim / Havok handling

---
 indra/newview/llfloatermodelpreview.cpp | 7 +++++--
 1 file changed, 5 insertions(+), 2 deletions(-)

diff --git a/indra/newview/llfloatermodelpreview.cpp b/indra/newview/llfloatermodelpreview.cpp
index f440092db4..6fa6935b5b 100644
--- a/indra/newview/llfloatermodelpreview.cpp
+++ b/indra/newview/llfloatermodelpreview.cpp
@@ -410,19 +410,22 @@ BOOL LLFloaterModelPreview::postBuild()
 	{
 		validate_url = llformat("http://secondlife.%s.lindenlab.com/my/account/mesh.php", current_grid.c_str());
 	}
-#ifndef HAVOK_TPV // <FS:AW optional opensim support>
+#ifdef OPENSIM // <FS:AW optional opensim support>
 	else
 	{
 		// TODO: Opensim: Set it to something reasonable
 		validate_url = LLGridManager::getInstance()->getLoginPage();
 	}
+#endif // OPENSIM <FS:AW optional opensim support>
 	// </Ansariel>
+
 // <FS:CR> Show an alert dialog if using the Opensim viewer as functionality will be limited without Havok
+#ifndef HAVOK_TPV
 	LLSD args;
 	args["FEATURE"] = getString("no_havok");
 	LLNotificationsUtil::add("NoHavok", args);
+#endif
 // </FS:CR>
-#endif // OPENSIM <FS:AW optional opensim support>
 
 	getChild<LLTextBox>("warning_message")->setTextArg("[VURL]", validate_url);