mirror of
https://github.com/overte-org/overte.git
synced 2025-08-08 14:18:24 +02:00
hook My Locations to data-web dialog
This commit is contained in:
parent
93561d3b21
commit
a0675162b6
3 changed files with 12 additions and 8 deletions
|
@ -1210,13 +1210,17 @@ void Menu::displayNameLocationResponse(const QString& errorString) {
|
||||||
|
|
||||||
void Menu::toggleLocationList() {
|
void Menu::toggleLocationList() {
|
||||||
if (!_userLocationsDialog) {
|
if (!_userLocationsDialog) {
|
||||||
_userLocationsDialog = new UserLocationsDialog(Application::getInstance()->getWindow());
|
_userLocationsDialog = DataWebDialog::dialogForPath("/locations");
|
||||||
}
|
}
|
||||||
if (_userLocationsDialog->isVisible()) {
|
|
||||||
_userLocationsDialog->hide();
|
if (!_userLocationsDialog->isVisible()) {
|
||||||
} else {
|
|
||||||
_userLocationsDialog->show();
|
_userLocationsDialog->show();
|
||||||
}
|
}
|
||||||
|
|
||||||
|
_userLocationsDialog->raise();
|
||||||
|
_userLocationsDialog->activateWindow();
|
||||||
|
_userLocationsDialog->showNormal();
|
||||||
|
|
||||||
}
|
}
|
||||||
|
|
||||||
void Menu::nameLocation() {
|
void Menu::nameLocation() {
|
||||||
|
|
|
@ -28,12 +28,12 @@
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
#include "location/LocationManager.h"
|
#include "location/LocationManager.h"
|
||||||
#include "ui/PreferencesDialog.h"
|
|
||||||
#include "ui/ChatWindow.h"
|
#include "ui/ChatWindow.h"
|
||||||
|
#include "ui/DataWebDialog.h"
|
||||||
#include "ui/JSConsole.h"
|
#include "ui/JSConsole.h"
|
||||||
#include "ui/LoginDialog.h"
|
#include "ui/LoginDialog.h"
|
||||||
|
#include "ui/PreferencesDialog.h"
|
||||||
#include "ui/ScriptEditorWindow.h"
|
#include "ui/ScriptEditorWindow.h"
|
||||||
#include "ui/UserLocationsDialog.h"
|
|
||||||
|
|
||||||
const float ADJUST_LOD_DOWN_FPS = 40.0;
|
const float ADJUST_LOD_DOWN_FPS = 40.0;
|
||||||
const float ADJUST_LOD_UP_FPS = 55.0;
|
const float ADJUST_LOD_UP_FPS = 55.0;
|
||||||
|
@ -273,7 +273,7 @@ private:
|
||||||
QDialog* _jsConsole;
|
QDialog* _jsConsole;
|
||||||
OctreeStatsDialog* _octreeStatsDialog;
|
OctreeStatsDialog* _octreeStatsDialog;
|
||||||
LodToolsDialog* _lodToolsDialog;
|
LodToolsDialog* _lodToolsDialog;
|
||||||
UserLocationsDialog* _userLocationsDialog;
|
QPointer<DataWebDialog> _userLocationsDialog;
|
||||||
#ifdef Q_OS_MAC
|
#ifdef Q_OS_MAC
|
||||||
SpeechRecognizer _speechRecognizer;
|
SpeechRecognizer _speechRecognizer;
|
||||||
#endif
|
#endif
|
||||||
|
|
|
@ -33,7 +33,7 @@ const char SOLO_NODE_TYPES[2] = {
|
||||||
NodeType::AudioMixer
|
NodeType::AudioMixer
|
||||||
};
|
};
|
||||||
|
|
||||||
const QUrl DEFAULT_NODE_AUTH_URL = QUrl("http://localhost:3000");
|
const QUrl DEFAULT_NODE_AUTH_URL = QUrl("https://data.highfidelity.io");
|
||||||
|
|
||||||
LimitedNodeList* LimitedNodeList::_sharedInstance = NULL;
|
LimitedNodeList* LimitedNodeList::_sharedInstance = NULL;
|
||||||
|
|
||||||
|
|
Loading…
Reference in a new issue