Mirrors/overte-lubosz
3
0
Fork 0
mirror of https://github.com/lubosz/overte.git synced 2025-08-08 03:08:00 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions

Merge pull request #11117 from hyperlogic/bug-fix/misc-crash-fixes

Browse source 
Crash fixes for avatars without Hips, and web overlays
This commit is contained in:
Seth Alves 2017-08-06 18:48:07 -07:00 committed by GitHub
commit 8798e47f99
2 changed files with 4 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
interface/src/avatar/MyCharacterController.cpp
View file

@ -36,7 +36,7 @@ MyCharacterController::~MyCharacterController() {
void MyCharacterController::setDynamicsWorld(btDynamicsWorld* world) { void MyCharacterController::setDynamicsWorld(btDynamicsWorld* world) {
CharacterController::setDynamicsWorld(world); CharacterController::setDynamicsWorld(world);
if (world) { if (world && _rigidBody) {
initRayShotgun(world); initRayShotgun(world);
} }
} }

5
interface/src/ui/overlays/Web3DOverlay.cpp
View file

@ -127,8 +127,9 @@ QString Web3DOverlay::pickURL() {
QUrl sourceUrl(_url); QUrl sourceUrl(_url);
if (sourceUrl.scheme() == "http" || sourceUrl.scheme() == "https" || if (sourceUrl.scheme() == "http" || sourceUrl.scheme() == "https" ||
_url.toLower().endsWith(".htm") || _url.toLower().endsWith(".html")) { _url.toLower().endsWith(".htm") || _url.toLower().endsWith(".html")) {
if (_webSurface) {
_webSurface->setBaseUrl(QUrl::fromLocalFile(PathUtils::resourcesPath() + "/qml/")); _webSurface->setBaseUrl(QUrl::fromLocalFile(PathUtils::resourcesPath() + "/qml/"));
}
return "Web3DOverlay.qml"; return "Web3DOverlay.qml";
} else { } else {
return QUrl::fromLocalFile(PathUtils::resourcesPath()).toString() + "/" + _url; return QUrl::fromLocalFile(PathUtils::resourcesPath()).toString() + "/" + _url;