From 59a6fa89538a1429d00279ed197433bbec08779a Mon Sep 17 00:00:00 2001 From: Stephen Birarda Date: Fri, 17 May 2013 17:52:23 -0700 Subject: [PATCH 1/2] reinstate an alphatbetical ordering in root CMakeLists --- CMakeLists.txt | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index 71fe49709b..8af8081975 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -2,6 +2,7 @@ cmake_minimum_required(VERSION 2.8) project(hifi) +add_subdirectory(animation-server) add_subdirectory(avatar-mixer) add_subdirectory(audio-mixer) add_subdirectory(domain-server) @@ -11,4 +12,4 @@ add_subdirectory(injector) add_subdirectory(pairing-server) add_subdirectory(space-server) add_subdirectory(voxel-edit) -add_subdirectory(animation-server)add_subdirectory(voxel-server) \ No newline at end of file +add_subdirectory(voxel-server) \ No newline at end of file From 391d6dca8ee1b7519fd13feacc5c6804963dbc63 Mon Sep 17 00:00:00 2001 From: Stephen Birarda Date: Fri, 17 May 2013 17:54:04 -0700 Subject: [PATCH 2/2] remove the voxel server erase all that's unused --- interface/src/Application.cpp | 7 ------- 1 file changed, 7 deletions(-) diff --git a/interface/src/Application.cpp b/interface/src/Application.cpp index cd5451c9fd..1f34ed3c09 100644 --- a/interface/src/Application.cpp +++ b/interface/src/Application.cpp @@ -456,13 +456,6 @@ void Application::resizeGL(int width, int height) { glLoadIdentity(); } -static void sendVoxelServerEraseAll() { - char message[100]; - sprintf(message,"%c%s",'Z',"erase all"); - int messageSize = strlen(message) + 1; - AgentList::getInstance()->broadcastToAgents((unsigned char*) message, messageSize, &AGENT_TYPE_VOXEL, 1); -} - static void sendVoxelServerAddScene() { char message[100]; sprintf(message,"%c%s",'Z',"add scene");