Mirrors/overte
3
0
Fork 0
mirror of https://github.com/overte-org/overte.git synced 2025-04-21 18:44:00 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions 2

Merge pull request #349 from birarda/master

Browse source 
alphabetical ordering in CMakeLists
This commit is contained in:
birarda 2013-05-17 17:55:06 -07:00
commit fc81e394cb
2 changed files with 2 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
CMakeLists.txt
View file

@ -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)
add_subdirectory(voxel-server)

7
interface/src/Application.cpp
View file

@ -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");