Merge branch 'master' of https://github.com/worklist/hifi into seeing_voxels

ZappoMan committed 12 years ago

Commit 8d53fc92 parents 2832c33 89cf2f916 files · +169 −58Browse files

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

Unified · Split

interface/src/Menu.cpp+1−1

@@ -993,7 +993,7 @@ void Menu::goTo() { · 992 unmodified lines
993	callbackParams.jsonCallbackMethod = "goToLocationFromResponse";	993	callbackParams.jsonCallbackMethod = "goToLocationFromResponse";
994		994
995	// there's a username entered by the user, make a request to the data-server for the associated location	995	// there's a username entered by the user, make a request to the data-server for the associated location
996	AccountManager::getInstance().authenticatedRequest("/api/v1/users/" + gotoDialog.textValue() + "/location",	996	AccountManager::getInstance().authenticatedRequest("/api/v1/users/" + gotoDialog.textValue() + "/address",
997	QNetworkAccessManager::GetOperation,	997	QNetworkAccessManager::GetOperation,
998	callbackParams);	998	callbackParams);
999	}	999	}