From 8addfdc433c453925a9f68dda9df2cfeb39f5c71 Mon Sep 17 00:00:00 2001
From: ZappoMan <bradh@konamoxt.com>
Date: Thu, 8 Aug 2013 12:54:34 -0700
Subject: [PATCH] add --domain and --MinimalEnvironment to voxel-server

---
 voxel-server/src/main.cpp | 14 +++++++++++++-
 1 file changed, 13 insertions(+), 1 deletion(-)

diff --git a/voxel-server/src/main.cpp b/voxel-server/src/main.cpp
index c6a8a61ca1..f5b0eca825 100644
--- a/voxel-server/src/main.cpp
+++ b/voxel-server/src/main.cpp
@@ -66,6 +66,7 @@ bool shouldShowAnimationDebug = false;
 bool displayVoxelStats = false;
 bool debugVoxelReceiving = false;
 bool sendEnvironments = true;
+bool sendMinimalEnvironment = false;
 
 EnvironmentData environmentData[3];
 
@@ -325,8 +326,9 @@ void deepestLevelVoxelDistributor(NodeList* nodeList,
         if (shouldSendEnvironments) {
             int numBytesPacketHeader = populateTypeAndVersion(tempOutputBuffer, PACKET_TYPE_ENVIRONMENT_DATA);
             int envPacketLength = numBytesPacketHeader;
+            int environmentsToSend = ::sendMinimalEnvironment ? 1 : sizeof(environmentData) / sizeof(EnvironmentData);
             
-            for (int i = 0; i < sizeof(environmentData) / sizeof(EnvironmentData); i++) {
+            for (int i = 0; i < environmentsToSend; i++) {
                 envPacketLength += environmentData[i].getBroadcastData(tempOutputBuffer + envPacketLength);
             }
             
@@ -482,6 +484,11 @@ int main(int argc, const char * argv[]) {
     if (dontSendEnvironments) {
         printf("Sending environments suppressed...\n");
         ::sendEnvironments = false;
+    } else { 
+        // should we send environments? Default is yes, but this command line suppresses sending
+        const char* MINIMAL_ENVIRONMENT = "--MinimalEnvironment";
+        ::sendMinimalEnvironment = cmdOptionExists(argc, argv, MINIMAL_ENVIRONMENT);
+        printf("Using Minimal Environment=%s\n", debug::valueOf(::sendMinimalEnvironment));
     }
     printf("Sending environments=%s\n", debug::valueOf(::sendEnvironments));
     
@@ -494,6 +501,11 @@ int main(int argc, const char * argv[]) {
     if (::wantLocalDomain) {
         printf("Local Domain MODE!\n");
         nodeList->setDomainIPToLocalhost();
+    } else {
+        const char* domainIP = getCmdOption(argc, argv, "--domain");
+        if (domainIP) {
+            NodeList::getInstance()->setDomainHostname(domainIP);
+        }
     }
 
     nodeList->linkedDataCreateCallback = &attachVoxelNodeDataToNode;