History

Merge branch 'master' of https://github.com/highfidelity/hifi

matsukaze committed 12 years ago

Commit 6e575bc2 parents ff7a1bd 95ccea719 files · +87 −85Browse files

Showing the changes to interface/src/Application.cpp (1 of 19 files). Show all

Unified · Split

interface/src/Application.cpp+3−3
@@ -3124,7 +3124,7 @@ void Application::nodeKilled(SharedNodePointer node) { · 3123 unmodified lines
3124 VoxelPositionSize rootDetails;3124 VoxelPositionSize rootDetails;
3125 voxelDetailsForCode(rootCode, rootDetails);3125 voxelDetailsForCode(rootCode, rootDetails);
3126 3126
3127 printf("voxel server going away...... v[%f, %f, %f, %f]\n",3127 qDebug("voxel server going away...... v[%f, %f, %f, %f]",
3128 rootDetails.x, rootDetails.y, rootDetails.z, rootDetails.s);3128 rootDetails.x, rootDetails.y, rootDetails.z, rootDetails.s);
3129 3129
3130 // Add the jurisditionDetails object to the list of "fade outs"3130 // Add the jurisditionDetails object to the list of "fade outs"
@@ -3155,7 +3155,7 @@ void Application::nodeKilled(SharedNodePointer node) { · 24 unmodified lines
3155 VoxelPositionSize rootDetails;3155 VoxelPositionSize rootDetails;
3156 voxelDetailsForCode(rootCode, rootDetails);3156 voxelDetailsForCode(rootCode, rootDetails);
3157 3157
3158 printf("particle server going away...... v[%f, %f, %f, %f]\n",3158 qDebug("particle server going away...... v[%f, %f, %f, %f]",
3159 rootDetails.x, rootDetails.y, rootDetails.z, rootDetails.s);3159 rootDetails.x, rootDetails.y, rootDetails.z, rootDetails.s);
3160 3160
3161 // Add the jurisditionDetails object to the list of "fade outs"3161 // Add the jurisditionDetails object to the list of "fade outs"
@@ -3236,7 +3236,7 @@ int Application::parseOctreeStats(const QByteArray& packet, const SharedNodePoin · 74 unmodified lines
3236 3236
3237 3237
3238 if (jurisdiction->find(nodeUUID) == jurisdiction->end()) {3238 if (jurisdiction->find(nodeUUID) == jurisdiction->end()) {
3239 printf("stats from new server... v[%f, %f, %f, %f]\n",3239 qDebug("stats from new server... v[%f, %f, %f, %f]",
3240 rootDetails.x, rootDetails.y, rootDetails.z, rootDetails.s);3240 rootDetails.x, rootDetails.y, rootDetails.z, rootDetails.s);
3241 3241
3242 // Add the jurisditionDetails object to the list of "fade outs"3242 // Add the jurisditionDetails object to the list of "fade outs"

Keyboard shortcuts

General

Show keyboard shortcuts
?
Focus the current search
/

Issues and pull requests

Open filters
f

Issues, pull requests and Inbox

Select next item
j↓
Select previous item
k↑
Open selected item
Enter
Dismiss filters or clear selection
Esc

Repository code

Go to file
t