livie
/
phoenix-firestorm
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Fix one more case of OpenSim / Havok handling

meow-7.2.2
Ansariel 2019-05-11 14:38:15 +02:00
parent 603b840a0f
commit 19a3d43ce9
1 changed files with 5 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
indra/newview/llfloatermodelpreview.cpp
View File

@ -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);