From 314921c7da523b468700bcab44019762a29b30dd Mon Sep 17 00:00:00 2001
From: Mark Mine <mark.mine@disney.com>
Date: Fri, 9 Aug 2002 23:26:04 +0000
Subject: [PATCH] Pass cluster mode in server startup command instead of using
 config variable

---
 direct/src/directtools/DirectSession.py | 8 +++++++-
 1 file changed, 7 insertions(+), 1 deletion(-)

diff --git a/direct/src/directtools/DirectSession.py b/direct/src/directtools/DirectSession.py
index f5a93ed3bc..36fd9472ca 100644
--- a/direct/src/directtools/DirectSession.py
+++ b/direct/src/directtools/DirectSession.py
@@ -173,7 +173,13 @@ class DirectSession(PandaObject):
             import TkGlobal
             self.panel = DirectSessionPanel(parent = tkroot)
 
-        self.clusterMode = base.config.GetString("cluster-mode", '')
+        try:
+            # Has the clusterMode been set externally (i.e. via the
+            # bootstrap application?
+            self.clusterMode = clusterMode
+        except NameError:
+            # Has the clusterMode been set via a config variable?
+            self.clusterMode = base.config.GetString("cluster-mode", '')
         if self.clusterMode == 'client':
             self.cluster = createClusterClient()
         elif self.clusterMode == 'server':