From 5a81ed73fe8e5da4d92d578eb80347f53248bcd4 Mon Sep 17 00:00:00 2001
From: Andrew Meadows <andrew@highfidelity.io>
Date: Fri, 27 Sep 2019 14:08:11 -0700
Subject: [PATCH] don't allow null Physics::sessionUUID

---
 libraries/shared/src/PhysicsHelpers.cpp | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/libraries/shared/src/PhysicsHelpers.cpp b/libraries/shared/src/PhysicsHelpers.cpp
index 092b9d078a..b7f5242429 100644
--- a/libraries/shared/src/PhysicsHelpers.cpp
+++ b/libraries/shared/src/PhysicsHelpers.cpp
@@ -10,10 +10,12 @@
 //
 
 #include "PhysicsHelpers.h"
-#include "NumericalConstants.h"
+
 #include <QUuid>
 
+#include "NumericalConstants.h"
 #include "PhysicsCollisionGroups.h"
+#include "SharedUtil.h"
 
 // This chunk of code was copied from Bullet-2.82, so we include the Bullet license here:
 /*
@@ -91,7 +93,7 @@ int32_t Physics::getDefaultCollisionMask(int32_t group) {
 QUuid _sessionID;
 
 void Physics::setSessionUUID(const QUuid& sessionID) {
-    _sessionID = sessionID;
+    _sessionID = sessionID.isNull() ? AVATAR_SELF_ID : sessionID;
 }
 
 const QUuid& Physics::getSessionUUID() {