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

Merge pull request #11238 from misslivirose/set-home-with-sandbox-starter

Browse source 
Create home bookmark for new content sets loaded in
This commit is contained in:
Chris Collins 2017-08-24 16:25:04 -07:00 committed by GitHub
commit 43b1e67e4a
3 changed files with 10 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
interface/src/Application.cpp
View file

@ -6288,7 +6288,11 @@ bool Application::askToReplaceDomainContent(const QString& url) {
octreeFilePacket->write(urlData);
limitedNodeList->sendPacket(std::move(octreeFilePacket), *octreeNode);
});
DependencyManager::get<AddressManager>()->handleLookupString(DOMAIN_SPAWNING_POINT);
auto addressManager = DependencyManager::get<AddressManager>();
addressManager->handleLookupString(DOMAIN_SPAWNING_POINT);
QString newHomeAddress = addressManager->getHost() + DOMAIN_SPAWNING_POINT;
qCDebug(interfaceapp) << "Setting new home bookmark to: " << newHomeAddress;
DependencyManager::get<LocationBookmarks>()->setHomeLocationToAddress(newHomeAddress);
methodDetails = "SuccessfulRequestToReplaceContent";
} else {
methodDetails = "UserDeclinedToReplaceContent";

4
interface/src/LocationBookmarks.cpp
View file

@ -63,6 +63,10 @@ void LocationBookmarks::setHomeLocation() {
Bookmarks::addBookmarkToFile(HOME_BOOKMARK, bookmarkAddress);
}
void LocationBookmarks::setHomeLocationToAddress(const QVariant& address) {
Bookmarks::insert("Home", address);
}
void LocationBookmarks::teleportToBookmark() {
QAction* action = qobject_cast<QAction*>(sender());
QString address = action->data().toString();

1
interface/src/LocationBookmarks.h
View file

@ -27,6 +27,7 @@ public:
public slots:
void addBookmark();
void setHomeLocationToAddress(const QVariant& address);
protected:
void addBookmarkToMenu(Menu* menubar, const QString& name, const QVariant& address) override;